Merge remote-tracking branch 'origin/dev_ch_master' into dev_nursing_records_20230214

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvSendMapper.java

@@ -60,12 +60,12 @@ public interface SrvSendMapper extends BaseMapper<ChSrvSend> {
             "       s.DISE_TYPE_S," +
             "        o.evaluate_rating," +
             "       i.finish_time," +
-            "       i.re_apr_time," +
+            "       i.re_apr_time,l.disable_level_name," +
             "       i.task_status" +
             "       from ch_apr_task i" +
             "       left join ch_disable_info s " +
             "       on s.disab_info_id = i.disable_info_id" +
-            "       left join ch_apr_report o on i.task_id = o.task_id" +
+            "       left join ch_apr_report o on i.task_id = o.task_id left join CH_CFG_SRV_DISABLE_LEVEL l on l.disable_level_id = o.disable_level_id " +
             "       where i.disable_info_id=#{disableInfoId}")
     List<DisableInfoTaskVO> selectTaskByDisableInfoId(Integer disableInfoId);