失能评定调整

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -137,8 +137,7 @@ public class DisableServiceImpl implements DisableService {
                 chAprTask.setLastAprDate(cd.getTime());//鉴定截至日期
             }
             BeanUtil.copyProperties(chDisableApply, chAprTask);
-            chAprTask.setDisableInfoId(chDisableInfo.getDisabInfoId());
-            //TODO 审核人id
+            chAprTask.setDisableInfoId(chDisableInfo.getDisabInfoId());//失能人员id
             aprTaskMapper.insert(chAprTask);
         }
     }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java

@@ -239,7 +239,8 @@ public class TaskServiceImpl implements TaskService {
                 return Result.failed("无效的taskId!");
             }
             //更新评定任务信息
-            task.setAprEmpId(Integer.parseInt(empId));
+            task.setAprOrganId(chAprEmp.getAprOrganId());//鉴定机构id
+            task.setAprEmpId(Integer.parseInt(empId));//评定人员id
             task.setAssignTime(assignTime);
             taskMapper.updateById(task);
             //更新失能人员信息

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

@@ -6,11 +6,11 @@
         select
         task.task_id taskId,
         task.apply_id applyId,
-        organ.organ_name organName,
-        task.apr_organ_id aprOrganId,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where organ.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where organ.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
+        organ.SRV_ORGAN_NAME organName,
+        organ.SRV_ORGAN_CODE aprOrganId,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
+        (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,
         disable.certi_code certiCode,
@@ -48,7 +48,8 @@
         reason.refuse_reason refuseReason,
         push.refuse_remark refuseRemark
         from CH_APR_TASK task
-        left join ch_apr_organ organ on task.apr_organ_id = organ.apr_organ_id
+        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_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
@@ -105,7 +106,7 @@
         SELECT report.REPORT_ID reportId,
         report.evaluate_time evaluateTime,
         task.APR_ORGAN_ID organId,
-        organ.ORGAN_NAME organName,
+        organ.SRV_ORGAN_NAME organName,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
@@ -137,7 +138,8 @@
         FROM ch_apr_report report
         LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID
         LEFT JOIN CH_DISABLE_INFO info ON task.disable_info_id = info.disab_info_id
-        LEFT JOIN CH_APR_ORGAN organ ON task.APR_ORGAN_ID = organ.APR_ORGAN_ID
+        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_RISK_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISA_RISK_LEVEL_ID
         <where>
             <if test="name != null and name != ''">