Merge branch 'dev_nursing_records_20230214' into dev_ch_master

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -531,14 +531,7 @@ public class DisableController {
         if (disableExitVO.getDisableInfoId() == null|| disableExitVO.getExitReasonId() == null||disableExitVO.getApplyId() == null) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
-        int i = disableService.disableInfoExit(disableExitVO);
-        if (i > 0) {
-            return Result.success();
-        } else {
-            return Result.failed();
-        }
-
-
+        return disableService.disableInfoExit(disableExitVO);
     }
 
 

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvTaskDetailMapper.java

@@ -37,11 +37,11 @@ public interface ChSrvTaskDetailMapper extends BaseMapper<ChSrvTaskDetail> {
 
     ChDisabDetailAccounts selectAccountsDetail(String disabInfoId, String srvDateStr);
 
-    void updateChDisabDetailAccounts(Long accountsId, BigDecimal accountsAllCostsub, BigDecimal accountsOverallCostsub, BigDecimal accountsPersonalCostsub);
 
 
     List<ChSrvTaskDetail2Vo> chSrvTaskDetailExportList(Long empId, String empName,String status,String sevrTime);
 
+    void updateChDisabDetailAccounts(Long accountsDetailId, BigDecimal accountsAllCostsub, BigDecimal accountsOverallCostsub, BigDecimal accountsPersonalCostsub);
 }
 
 

apply/apply-service/src/main/java/com/hungraim/ltc/dao/ChSrvTaskMapper.java

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ChSrvTaskMapper extends BaseMapper<ChSrvTask> {
+}
\ No newline at end of file

apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableInfoMapper.java

@@ -38,6 +38,9 @@ public interface DisableInfoMapper extends BaseMapper<ChDisableInfo> {
     List<ProgramRespDTO> selectProgram(String disabInfoId, String srvOrganId);
 
 
+     int  selectSrvSend(String disabInfoId);
+
+
     int updateSrvProgramById(ChSrvProgram chSrvProgram);
 
 

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -185,7 +185,7 @@ public interface DisableService {
                              Integer applyMethod);
 
 
-    int disableInfoExit(DisableExitVO disableExitVO);
+    Result disableInfoExit(DisableExitVO disableExitVO);
 
     void disableExitHanlder(Integer exitReasonId, Integer srvOrganId, Integer disableInfoId, Date date);
 

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

@@ -8,6 +8,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.AttachFeignService;
@@ -30,8 +31,8 @@ import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import oracle.sql.DATE;
 import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.record.common.FeatSmartTag;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,12 +65,15 @@ public class DisableServiceImpl implements DisableService {
     private final OrganService organService;
     private final ChSrvSendInfoMapper chSrvSendInfoMapper;
 
+    private  final ChSrvTaskMapper chSrvTaskMapper;
+
     @Autowired
     private ChDisableRiskLevelMapper chDisableRiskLevelMapper;
 
 
 
 
+
     /**
      * 获取机构ids
      *
@@ -582,11 +586,10 @@ public class DisableServiceImpl implements DisableService {
         Page<DisableInfoListVo> disableInfoList = disableInfoMapper.getDisableInfoList(page, srvOrganId, certiCode, realName, svrModelId);
         List<DisableInfoListVo> records = disableInfoList.getRecords();
         for (DisableInfoListVo record : records) {
-             if(record.getExitReasonId()!=null && 4 == record.getExitReasonId()){
+             if(record.getExitReasonId()!=null){
                  Long disabInfoId = record.getDisabInfoId();
-                 Long srvOrganId1 = record.getSrvOrganId();
-                 List<ProgramRespDTO> programRespDTOS = disableInfoMapper.selectProgram(String.valueOf(disabInfoId), String.valueOf(srvOrganId1));
-                 if(CollectionUtil.isNotEmpty(programRespDTOS)) {
+                 int count = disableInfoMapper.selectSrvSend(String.valueOf(disabInfoId));
+                 if(count > 0) {
                      record.setExitFlag(null);
                      record.setExitReasonId(null);
                      record.setExitTime(null);
@@ -634,7 +637,7 @@ public class DisableServiceImpl implements DisableService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int disableInfoExit(DisableExitVO disableExitVO) {
+    public Result disableInfoExit(DisableExitVO disableExitVO) {
         String exitTime = disableExitVO.getExitTime();
         Integer applyId = disableExitVO.getApplyId();
         Integer exitReasonId = disableExitVO.getExitReasonId();
@@ -660,9 +663,21 @@ public class DisableServiceImpl implements DisableService {
          boolean now = DateUtils.isNow(date);
             if (now) {
                 disableExitHanlder(exitReasonId, srvOrganId, disableInfoId, date);
+            } else {
+                // 插入历史记录
+                ChDisableExit chDisableExit = new ChDisableExit();
+                chDisableExit.setDisabInfoId(disableInfoId);
+                chDisableExit.setExitReasonId(exitReasonId);
+                chDisableExit.setExitTime(date);
+                chDisableExit.setSrvOrganId(srvOrganId);
+                disableExitMapper.insert(chDisableExit);
+                return Result.failed("操作成功,退出状态及服务方案和计划将在"+exitTime+"日自动终止");
+            }
+        if (result > 0) {
+            return Result.success();
+        } else {
+            return Result.failed();
         }
-
-        return result;
     }
 
     /**
@@ -682,22 +697,23 @@ public class DisableServiceImpl implements DisableService {
         chSrvProgram.setEndReason("失能人员退出,终止方案");
         disableInfoMapper.updateSrvProgramById(chSrvProgram);
 
+        UpdateWrapper updateWrapper2 = new UpdateWrapper();
+        updateWrapper2.eq("DISAB_INFO_ID", Long.valueOf(disableInfoId));
+        updateWrapper2.notIn("status",2);
+        updateWrapper2.set("status", 2);
+        updateWrapper2.set("LCD", new DATE());
+        updateWrapper2.set("end_reason", "失能人员退出，计划终止");
+        chSrvTaskMapper.update(null, updateWrapper2);
+
         ChSrvSend chSrvSend = new ChSrvSend();
         chSrvSend.setDisabInfoId(Long.valueOf(disableInfoId));
         chSrvSend.setEndTime(date);
-        //4,转入医保  5, 异地 选择原因转入医保和异地，保留原服务机构分配数据，状态为已分配，只终止方案和计划，保留终止后的方案和计划历史数据
-        if (exitReasonId == 4||exitReasonId==5){
-          //  chSrvSend.setStatus((short)3);
-           // disableInfoMapper.updateSrvSendById(chSrvSend);
-            //  1,  死亡
-         }else if (exitReasonId == 1){
+
         // 更新已分配为已退出
         chSrvSend.setStatus((short)3);
         disableInfoMapper.updateSrvSendById(chSrvSend);
-         }else {
-            chSrvSend.setStatus((short)3);
-            // 更新为已退出
-            disableInfoMapper.updateSrvSendById(chSrvSend);
+        //4,转入医保  5, 异地 选择原因转入医保和异地，保留原服务机构分配数据，状态为已分配，只终止方案和计划，保留终止后的方案和计划历史数据
+        if  (exitReasonId != 1){
             // 插入一条未分配的记录
             ChSrvSend chSrvSend1 = new ChSrvSend();
             chSrvSend1.setDisabInfoId(Long.valueOf(disableInfoId));
@@ -705,6 +721,7 @@ public class DisableServiceImpl implements DisableService {
             chSrvSend1.setStatus((short)0);
             chSrvSendInfoMapper.insert(chSrvSend1);
         }
+        if(srvOrganId != null) {
             // 插入历史记录
             ChDisableExit chDisableExit = new ChDisableExit();
             chDisableExit.setDisabInfoId(disableInfoId);
@@ -712,6 +729,8 @@ public class DisableServiceImpl implements DisableService {
             chDisableExit.setExitTime(date);
             chDisableExit.setSrvOrganId(srvOrganId);
             disableExitMapper.insert(chDisableExit);
+
+        }
     }
 
     @Override
@@ -742,7 +761,7 @@ public class DisableServiceImpl implements DisableService {
             Long disabInfoId = disableInfoListVo.getDisabInfoId();
             String exitTime = disableInfoListVo.getExitTime();
             Date date = DateUtils.strToDate(exitTime);
-            disableExitHanlder(exitReasonId,srvOrganId.intValue(),disabInfoId.intValue(),date);
+            disableExitHanlder(exitReasonId,null,disabInfoId.intValue(),date);
         }
     }
 

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

@@ -44,6 +44,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -218,14 +219,15 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
             Date srvEndTime = chSrvTaskDetail.getSrvEndTime();
             String srvEndTimeStr = DateUtils.dateTimeToStr(srvEndTime);
             Long min = dateDiff(srvStartTimeStr, srvEndTimeStr, "yyyy-MM-dd HH:mm:ss", "min");
-            if(min>=90){
+            if(min>=90) {
                 Date srvDate = chSrvTaskDetail.getSrvDate();
                 String srvDateStr = DateUtils.dateToStrYm(srvDate);
                 Long srvTaskId = chSrvTaskDetail.getSrvTaskId();
                 String disabInfoId = chSrvTaskDetailMapper.selectBySrvTaskId(String.valueOf(srvTaskId));
                 ChDisabDetailAccounts chDisabDetailAccounts = chSrvTaskDetailMapper.selectAccountsDetail(disabInfoId, srvDateStr);
+                if (Objects.nonNull(chDisabDetailAccounts)) {
                     Short status = chDisabDetailAccounts.getStatus();
-                if(status != 0){
+                    if (status != 0) {
                         // 已申报不能进行删除
                         return Result.failed("已申报不能进行删除");
                     }
@@ -235,8 +237,9 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
                     BigDecimal accountsAllCostsub = accountsAllCost.subtract(new BigDecimal(75));
                     BigDecimal accountsOverallCostsub = accountsOverallCost.subtract(new BigDecimal(60));
                     BigDecimal accountsPersonalCostsub = accountsPersonalCost.subtract(new BigDecimal(15));
-                Long accountsId = chDisabDetailAccounts.getAccountsId();
-                chSrvTaskDetailMapper.updateChDisabDetailAccounts(accountsId,accountsAllCostsub,accountsOverallCostsub,accountsPersonalCostsub);
+                    Long accountsDetailId = chDisabDetailAccounts.getAccountsDetailId();
+                    chSrvTaskDetailMapper.updateChDisabDetailAccounts(accountsDetailId, accountsAllCostsub, accountsOverallCostsub, accountsPersonalCostsub);
+                }
             }
         }
         chSrvTaskDetailMapper.deleteFinshItem(taskDetailId);

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

@@ -128,7 +128,7 @@ WHERE TASK_DETAIL_ID =  #{taskDetailId}
   <update id = "updateChDisabDetailAccounts">
    UPDATE CH_DISAB_ACCOUNTS_DETAIL d SET  d.ACCOUNTS_ALL_COST = #{accountsAllCostsub}, d.ACCOUNTS_OVERALL_COST =  #{accountsOverallCostsub},
    d.ACCOUNTS_PERSONAL_COST =  #{accountsPersonalCostsub}
-   WHERE  d.ACCOUNTS_ID =  #{accountsId}
+   WHERE  d.ACCOUNTS_DETAIL_ID =  #{accountsDetailId}
   </update>
 
   <select id="selectBySrvTaskId" resultType="java.lang.String">

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

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hungraim.ltc.dao.DisableInfoMapper">
     <select id="getDisableInfoList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableInfoListVo">
+
         with bb as (
-        SELECT    T2.DISAB_INFO_ID       disabInfoId,
-        max(T6.SRV_ORGAN_ID)        srvOrganId,
+        SELECT    max(T6.SRV_SEND_ID) srvSendId,
+        T2.DISAB_INFO_ID       disabInfoId,
         T2.REAL_NAME           realName,
         DECODE(max(T2.SRV_MODE_ID), '1','医疗','2', '养老','3','上门', '4', '异地') svrModelName,
-        max(T5.SRV_ORGAN_NAME)      svrOrganName,
         to_char(max(e.EXIT_TIME),'yyyy-MM-dd')  exitTime,
         max(T2.CERTI_CODE) CERTI_CODE,
         max(e.EXIT_REASON_ID)     exitReasonId,
@@ -16,16 +16,17 @@
         max(apply.apply_id) applyId
         FROM   CH_SRV_SEND   T6
         LEFT join CH_DISABLE_INFO T2  on T6.DISAB_INFO_ID = T2.DISAB_INFO_ID
-        LEFT JOIN CH_SRV_ORGAN T5 ON T6.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
         left join CH_DISABLE_APPLY apply on  apply.APPLY_ID =  T2.APPLY_ID
         left join       CH_DISABLE_EXIT
         e on e.DISAB_INFO_ID = T2.DISAB_INFO_ID
         group by  T2.DISAB_INFO_ID,T2.REAL_NAME)
-        select t.*, ( case  when     t.exitReasonId is null then  null else 1 end ) exitFlag from  bb t
+        select t.*,o.SRV_ORGAN_ID srvOrganId,o.SRV_ORGAN_NAME svrOrganName, ( case  when     t.exitReasonId is null then  null else 1 end ) exitFlag from  bb t
+        left join CH_SRV_SEND s on t.srvSendId = s.SRV_SEND_ID
+        LEFT JOIN CH_SRV_ORGAN o ON o.SRV_ORGAN_ID = s.SRV_ORGAN_ID
         <where>
         1=1
         <if test="srvOrganId != null and srvOrganId != '' and srvOrganId!=0">
-            and    t.srvOrganId = #{srvOrganId}
+            and    o.SRV_ORGAN_ID = #{srvOrganId}
         </if>
         <if test="certiCode != null and certiCode != ''">
             and  t.CERTI_CODE = #{certiCode}
@@ -44,31 +45,14 @@
 
 
     <select id="getDisableExitList" resultType="com.hungraim.ltc.pojo.vo.disable.DisableInfoListVo">
-        SELECT distinct  T2.DISAB_INFO_ID       disabInfoId,
-        T1.PROGRAM_ID          programId,
-        T6.SRV_ORGAN_ID        srvOrganId,
-        T5.DISTRICT_PROVINCIAL districtProvincial,
-        T5.DISTRICT_CITY       districtCity,
-        T2.REAL_NAME           realName,
-        T7.MODE_NAME           svrModelName,
-        T5.SRV_ORGAN_NAME      svrOrganName,
-        T1.PROG_STATUS         progStatus,
-        T1.EFF_TIME            effTime,
+SELECT distinct  T2.DISAB_INFO_ID       disabInfoId,
                  T2.CERTI_CODE  certiCode,
                  T2.APPLY_ID applyId,
                  to_char(T2.EXIT_TIME,'yyyy-MM-dd')  exitTime,
-        --服务方案起始日
-        --服务方案终止日
-        to_char(T1.PROGRAM_DATE,'yyyy-MM-dd HH24:mi:ss')  programDate,
-        to_char(T1.PROGRAM_EDN_DATE,'yyyy-MM-dd HH24:mi:ss')   programEdnDate,
                  T2.EXIT_FLAG          exitFlag,
                  T2.EXIT_REASON_ID     exitReasonId
-        FROM  CH_DISABLE_INFO T2
-        inner join (select * from CH_SRV_SEND where STATUS in(1,3)) T6 on T6.DISAB_INFO_ID = T2.DISAB_INFO_ID
-        LEFT JOIN CH_SRV_PROGRAM T1 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
-        LEFT JOIN CH_CFG_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.MODE_ID
-        LEFT JOIN CH_SRV_ORGAN T5 ON T6.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
-        where  T2.EXIT_TIME is not null
+FROM  CH_DISABLE_INFO T2
+where  T2.EXIT_TIME is not null
        and T2.EXIT_TIME = to_date(to_char(sysdate,'yyyy-MM-dd'),'yyyy-MM-dd')
        </select>
 
@@ -85,6 +69,7 @@
     <update id="updateSrvProgramById" parameterType="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram">
       update    CH_SRV_PROGRAM g set g.PROG_STATUS ='2',g.END_REASON = #{endReason} where
       g.DISAB_INFO_ID =#{disabInfoId}      and g.PROGRAM_DATE  <![CDATA[ <  ]]> sysdate
+      and g.PROG_STATUS <![CDATA[ <>  ]]>'2'
     </update>
 
     <update id="updateSrvSendById" parameterType="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvSend">
@@ -102,5 +87,10 @@
           <![CDATA[ t.PROG_STATUS<> 2 ]]>  order by t.FCD desc
     </select>
 
+    <select id="selectSrvSend" resultType="java.lang.Integer">
+        select count(*) from CH_SRV_SEND t where  t.DISAB_INFO_ID = #{disabInfoId} and
+        t.STATUS = 1
+    </select>
+
 
 </mapper>
\ No newline at end of file

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvProgramServiceImpl.java

 package com.hungraim.ltc.governance.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.governance.dao.ChSrvProgramMapper;
 import com.hungraim.ltc.governance.dao.ChSrvProgramSetMapper;
 import com.hungraim.ltc.governance.dao.ChSrvSendMapper;
+import com.hungraim.ltc.governance.dao.ChSrvTaskMapper;
 import com.hungraim.ltc.governance.service.SrvProgramService;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
@@ -19,6 +21,7 @@ import com.hungraim.ltc.util.AttachType;
 import com.hungraim.ltc.util.Result;
 import com.hungraim.ltc.util.ResultCode;
 import lombok.extern.slf4j.Slf4j;
+import oracle.sql.DATE;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +46,9 @@ public class SrvProgramServiceImpl implements SrvProgramService {
     @Autowired
     private AttachFeignService attachFeignService;
 
+    @Autowired
+    private ChSrvTaskMapper chSrvTaskMapper;
+
     @Override
     public Page<SvrSendListVo> getProgramList(Page<SvrSendListVo> page, Long srvOrganId, String realName, String realTel, String programStatus) {
         return chSrvSendMapper.selectSrvSendList(page, srvOrganId, realName, realTel, programStatus);
@@ -151,7 +157,15 @@ public class SrvProgramServiceImpl implements SrvProgramService {
         chSrvProgram.setProgramId(programId);
         chSrvProgram.setEndReason(endReason);
         chSrvProgram.setProgStatus(2);
-        chSrvProgramMapper.updateById(chSrvProgram);
+        int updateCount = chSrvProgramMapper.updateById(chSrvProgram);
+        if(updateCount > 0 ) {
+            UpdateWrapper updateWrapper2 = new UpdateWrapper();
+            updateWrapper2.eq("program_id", programId);
+            updateWrapper2.set("status", 2);
+            updateWrapper2.set("LCD", new DATE());
+            updateWrapper2.set("end_reason", "服务方案终止");
+            chSrvTaskMapper.update(null, updateWrapper2);
+        }
     }
 
     @Override