Merge remote-tracking branch 'origin/dev_20230309_66_69_70问题优化_zxl' into dev_ch_master

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

@@ -183,7 +183,7 @@ public class TaskServiceImpl implements TaskService {
         if (reportDetailVO.getPerson2() != null) {
             ChAprPersonInfo personInfo = new ChAprPersonInfo();
             personInfo.setReportId(report.getReportId());
-            personInfo.setEmpId(reportDetailVO.getPerson1());
+            personInfo.setEmpId(reportDetailVO.getPerson2());
             personInfo.setFcd(new Date());
             personInfoMapper.insert(personInfo);
         }

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

@@ -395,8 +395,8 @@
                push.Refuse_remark    refuseRemark
         FROM ch_apr_task_push_his push
                  LEFT JOIN ch_apr_task task ON push.TASK_ID = task.TASK_ID
-                 left join ch_apr_organ organ on task.apr_organ_id = organ.apr_organ_id
                  LEFT JOIN ch_apr_emp emp on push.emp_id = emp.emp_id
+                 left join ch_apr_organ organ on emp.apr_organ_id = organ.apr_organ_id
         WHERE push.TASK_ID = #{taskId}
     </select>