添加失能人员

account/account-service/src/main/resources/mapper/ChDisabAccountsDetailMapper.xml

@@ -64,10 +64,12 @@
          DECODE(plan.MODE_ID, '1','医疗','2', '养老','3','上门') modeName,
                to_char(plan.CREATION_TIME,'yyyy-MM-dd HH24:mi:ss') executionTime,
                plan.item_name itemName,
-               emp.EMP_NAME empName
+               emp.EMP_NAME empName,
+               info.REAL_NAME realName
         from CH_SRV_PLAN plan
        left join CH_SRV_ORGAN organ on organ.SRV_ORGAN_ID = plan.SRV_ORGAN_ID
        left join ch_srv_organ_emp emp on plan.emp_id = emp.emp_id
+       left join  CH_DISABLE_INFO info on info.DISAB_INFO_ID = plan.DISAB_INFO_ID
         where  plan.DISAB_INFO_ID  = #{req.disabInfoId}
          and plan.SRV_ORGAN_ID  = #{req.srvOrganId}
          and plan.MODE_ID  = #{req.modeId}
@@ -84,10 +86,12 @@
   service.SERVICE_TYPE_DETAILED_NAME itemName,
   to_char(detail.SRV_START_TIME,'yyyy-MM-dd HH24:mi:ss') srvStartTime,
   to_char(detail.SRV_END_TIME,'yyyy-MM-dd HH24:mi:ss') srvEndTime,
-  m.EMP_NAME empName
+  m.EMP_NAME empName,
+  info.REAL_NAME realName
 from CH_SRV_TASK_FINISH_ITEM item
   left join CH_SRV_TASK_DETAIL detail on detail.TASK_DETAIL_ID = item.TASK_DETAIL_ID
   left join CH_SRV_TASK task on task.SRV_TASK_ID = detail.SRV_TASK_ID
+      left join  CH_DISABLE_INFO info on info.DISAB_INFO_ID = task.DISAB_INFO_ID
   LEFT JOIN CH_SRV_ORGAN_EMP m ON m.EMP_ID = task.SRV_EMP_ID
   LEFT JOIN CH_SRV_ORGAN organ ON organ.SRV_ORGAN_ID = m.SRV_ORGAN_ID
   LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = item.ITEM_ID

apply/apply-service/src/main/resources/mapper/ChSrvTaskDetailMapper.xml

@@ -66,12 +66,15 @@
       --t.STATUS status,
       decode( t.STATUS, '0', '未执行', '1', '执行中', '2', '已执行', '4', '已完成' ) AS status,
       t.SRV_START_TIME sevStarTime,
-      t.SRV_END_TIME sevEndTime
+      t.SRV_END_TIME sevEndTime,
+      info.REAL_NAME realName
     FROM
       CH_SRV_TASK_DETAIL t
         LEFT JOIN  CH_SRV_TASK k ON t.SRV_TASK_ID = k.SRV_TASK_ID
+           left join  CH_DISABLE_INFO info on info.DISAB_INFO_ID = k.DISAB_INFO_ID
         LEFT JOIN  CH_SRV_ORGAN_EMP m ON m.EMP_ID = k.SRV_EMP_ID
         LEFT JOIN CH_SRV_ORGAN T5 ON T5.SRV_ORGAN_ID = m.SRV_ORGAN_ID
     WHERE m.EMP_ID = #{empId}
+    order by t.STATUS desc
   </select>
 </mapper>
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/account/NursingRecordsRespVO.java

@@ -39,5 +39,7 @@ public class NursingRecordsRespVO {
 
     private String empName;
 
+    private String realName;
+
 
 }

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChSrvTaskDetail2Vo.java

@@ -24,4 +24,6 @@ public class ChSrvTaskDetail2Vo extends BaseReq {
     private String sevStarTime;
 
     private String sevEndTime;
+
+    private String realName;
 }