Merge branch 'dev_nursing_records_20230214' into uat_ch_master

assessment/assessment-service/src/main/resources/mapper/ChDisableEvaluateMapper.xml

@@ -24,7 +24,8 @@
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
         disable.real_name realName,
-        task.fcd fcd,
+        --task.fcd fcd,
+        apply.APPLY_TIME fcd,
         disable.certi_code certiCode,
         disable.disease_desc diseaseDesc,
         disable.adress_detail operAddress,
@@ -65,6 +66,7 @@
         left join ch_apr_organ aprOrgan on task.apr_organ_id = aprOrgan.apr_organ_id
        -- left join ch_srv_organ organ on aprOrgan.organ_id = organ.organ_id
         left join ch_disable_info disable on task.disable_info_id = disable.disab_info_id
+        left join CH_DISABLE_APPLY apply on apply.apply_id = disable.apply_id
         left join ch_apr_emp emp on task.apr_emp_id = emp.emp_id and emp.IS_LOCK = 0
         left join ch_apr_task_push push on task.task_id = push.task_id
         left join ch_apr_task_emp cate on task.task_id = cate.task_id