Merge remote-tracking branch 'origin/dev-20230128'

account/account-service/src/main/java/com/hungraim/ltc/account/dao/ChDisabAccountsDetailMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Repository
 public interface ChDisabAccountsDetailMapper extends BaseMapper<ChDisabDetailAccounts> {
 
-    List<OrganAccountsVO> getOrganAccountsList(@Param("taskDetailIds") List<String> taskDetailIds, String status);
+    List<OrganAccountsVO> getOrganAccountsList(String taskDetailId);
 
 
     Page<SrvOrganAccountListResp> searchSrvOrganAccountList(Page page, List<Long> organIds, SrvOrganListReq req);

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

@@ -11,10 +11,10 @@
         --身份证号
         disable.CERTI_CODE certiCode,
         --所在省市
-        apply.MEDICAL_AREA medicalArea,
-        mode1.MODE_ID modeId,
+        (select district_name from ch_fnd_district dis where apply.MEDICAL_AREA = dis.district_code)  medicalArea,
+        program.SRV_MODE_ID  modeId,
         --服务方式
-        mode1.mode_name     srvModeName,
+        DECODE(program.SRV_MODE_ID, '1','医疗','2', '养老','3','上门', '4', '异地') srvModeName,
         --护理机构名称
         organ.srv_organ_id srvOrganId,
         --护理机构名称
@@ -23,41 +23,21 @@
         emp.emp_name empName,
         --任务时间
         detail.SRV_DATE srvDate,
-        detail.SRV_START_TIME srvStartTime,
-        detail.SRV_END_TIME srvEndTime,
         -- 机构等级
         organ.LEVEL_CODE levelCode,
-        -- 失能等级
-        level1.DISABLE_LEVEL_NAME disableLevelName,
-        d.service_type_detailed_name itemName
-        ,d.PARA_ID,
-        CSOP.ITEM_TIMES,
-        CSOP.ITEM_TIMES_TYPE,
         CSTFI.ITEM_ID  itemId
         from ch_srv_task_detail detail--服务计划
         left join ch_srv_task task on task.srv_task_id = detail.srv_task_id--服务计划详情
         left join ch_disable_info disable on task.disab_info_id = disable.disab_info_id--失能人员
         left join CH_DEV.CH_DISABLE_APPLY apply on apply.apply_id = disable.apply_id
-        left join ch_apr_task aprtask on disable.last_task_id = aprtask.task_id--评定任务
-        left join ch_apr_report report on aprtask.task_id = report.task_id--评定报告
+        left join ch_srv_organ_emp emp on task.srv_emp_id = emp.emp_id--护理人员
         left join ch_srv_program program on task.program_id = program.program_id--服务方案
         left join ch_srv_organ organ on program.srv_organ_id = organ.srv_organ_id--服务机构
-        left join ch_cfg_srv_mode mode1 on program.srv_mode_id = mode1.mode_id--服务方式
-        left join ch_srv_organ_emp emp on task.srv_emp_id = emp.emp_id--护理人员
-        -- 失能等级
-        left join ch_cfg_srv_disable_level level1 on report.disable_level_id = level1.disable_level_id
         LEFT JOIN CH_SRV_TASK_FINISH_ITEM CSTFI ON detail.TASK_DETAIL_ID = CSTFI.TASK_DETAIL_ID
-        LEFT JOIN CH_SRV_ORGAN_PROJECT CSOP ON CSOP.PROJECT_ID = CSTFI.ITEM_ID
-        LEFT JOIN CH_SERVICE_TYPE_detailed d on d.service_type_detailed_id = CSOP.item_name
         <where>
-            <if test="status != null and status != ''">
-                AND  detail.STATUS = #{status}
-            </if>
-            <if test="taskDetailIds != null and taskDetailIds.size() > 0">
-                AND detail.TASK_DETAIL_ID IN
-                <foreach collection="taskDetailIds" separator="," open="(" close=")" item="taskDetailId">
-                    #{taskDetailId}
-                </foreach>
+             detail.STATUS = '4'
+            <if test="taskDetailId != null and taskDetailId != ''">
+                AND  detail.TASK_DETAIL_ID  = #{taskDetailId}
             </if>
         </where>
     </select>
@@ -169,7 +149,7 @@ select
   --身份证号
   disable.CERTI_CODE certiCode,
   --所在省市
-  apply.MEDICAL_AREA medicalArea,
+   (select district_name from ch_fnd_district dis where apply.MEDICAL_AREA = dis.district_code)  medicalArea,
   mode1.MODE_ID modeId,
   --服务方式
   mode1.mode_name     srvModeName,

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

@@ -11,7 +11,7 @@
   d.ACCOUNTS_ALL_COST accountsAllCost,
   d.ACCOUNTS_OVERALL_COST accountsOverallCost,
   d.ACCOUNTS_PERSONAL_COST accountsPersonalCost,
-  apply.MEDICAL_AREA medicalArea,
+   (select district_name from ch_fnd_district dis where apply.MEDICAL_AREA = dis.district_code)  medicalArea,
   o.SRV_ORGAN_NAME  srvOrganName,
   info.REAL_NAME realName
 from  CH_DISAB_ACCOUNTS_DETAIL  d

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

@@ -9,6 +9,7 @@
      plan.TASK_DETAIL_ID taskDetailId,
      plan.ITEM_NAME itemName,
      emp.emp_name empName,
+     DECODE(plan.MODE_ID, '1','医疗','2', '养老','3','上门', '4', '异地') srvModeName,
      to_char(plan.SRV_PLAN_TIME,'yyyy-MM-dd') srvDate,
      plan.IS_STATUS status
      from ch_srv_plan plan

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

@@ -10,7 +10,7 @@
    d.ASSESS_COST assessAllCost,
    organ.organ_name assessOrganName,
   to_char(d.ACCOUNTS_TIME,'yyyy-MM') accountsTime,
-  apply.MEDICAL_AREA medicalArea,
+  (select district_name from ch_fnd_district dis where apply.MEDICAL_AREA = dis.district_code)  medicalArea,
   to_char(d.assess_time,'yyyy-MM-dd') assessTime,
   emp.REAL_NAME empName
 from CH_ASSESS_ACCOUNTS_DETAIL d
@@ -28,7 +28,7 @@ SELECT
   t1.ASSESS_COST assessCost,
   to_char(t1.assess_time,'yyyy-MM-dd') assessTime,
   t4.REAL_NAME empName,
-   t2.MEDICAL_AREA medicalArea
+    (select district_name from ch_fnd_district dis where t2.MEDICAL_AREA = dis.district_code)  medicalArea,
 FROM
   CH_ASSESS_ACCOUNTS_DETAIL t1
   left join CH_DISABLE_APPLY t2 on t1.APPLY_ID = t2.APPLY_ID

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/account/SrvTaskRespVO.java

@@ -32,6 +32,6 @@ public class SrvTaskRespVO {
 
     private Long status;
 
-
+    private String srvModeName;
 
 }