复核备注

account/account-service/src/main/java/com/hungraim/ltc/account/service/impl/AccountServiceImpl.java

@@ -67,6 +67,7 @@ public class AccountServiceImpl extends ServiceImpl<ChDisabAccountsMapper, ChDis
         ChDisabAccounts chDisabAccounts = new ChDisabAccounts();
         BeanUtils.copyProperties(accountOperVo, chDisabAccounts);
         chDisabAccounts.setChooseSettle((short) 0); // 是否结算(0未结算，1已结算)
+        chDisabAccounts.setReviewRemark(accountOperVo.getReviewRemark());
         Short accountsStatus = accountOperVo.getAccountsStatus();
         String accountsId = String.valueOf(accountOperVo.getAccountsId());
         // 驳回

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

@@ -41,6 +41,7 @@
         t1.OVERALL_COST,
         t1.PERSONAL_COST,
         t1.SVR_START_TIME,
+        t1.REVIEW_REMARK reviewRemark,
         t1.MODE_NAME,
         to_char(t1.SVR_START_TIME,'yyyy-MM-dd') svrStartTime,
         to_char(t1.SVR_END_TIME,'yyyy-MM-dd') svrEndTime,

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

@@ -62,6 +62,7 @@
                 and s.SRV_ORGAN_NAME like CONCAT(CONCAT('%',#{srvOrganName}) ,'%')
             </if>
         </where>
+        order by a.EFF_TIME desc
     </select>
 
     <select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO">

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

@@ -2,9 +2,9 @@
 <!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">
-        SELECT distinct T1.PROGRAM_ID          programId,
-        T1.SRV_ORGAN_ID        srvOrganId,
-        T1.DISAB_INFO_ID       disabInfoId,
+        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,
@@ -30,13 +30,14 @@
         T2.EXIT_FLAG          exitFlag,
         T2.EXIT_REASON_ID     exitReasonId
         FROM  CH_DISABLE_INFO T2
-        INNER JOIN CH_SRV_PROGRAM T1 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
+        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 T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
-        <where>
+        LEFT JOIN CH_SRV_ORGAN T5 ON T6.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
+         <where>
            1=1
         <if test="srvOrganId != null and srvOrganId != '' and srvOrganId!=0">
-          and   T1.SRV_ORGAN_ID = #{srvOrganId}
+          and   T5.SRV_ORGAN_ID = #{srvOrganId}
         </if>
         <if test="certiCode != null and certiCode != ''">
             and T2.CERTI_CODE = #{certiCode}
@@ -48,6 +49,7 @@
             and  T7.MODE_ID = #{svrModelId}
         </if>
         </where>
+
     </select>
 
     <update id="updateChSrvProgram">

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

@@ -76,6 +76,11 @@ public class ChDisabAccounts implements Serializable {
     private String checkRemark;
 
     /**
+     * 复核备注
+     */
+    private String reviewRemark;
+
+    /**
      * 服务方式
      */
     private String  modeName;

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

@@ -92,5 +92,10 @@ public class SrvOrganAccountListResp {
      */
     private String reissueAmountTotal;
 
+    /**
+     *复核备注
+     */
+    private String reviewRemark;
+
 
 }

governance/src/main/java/com/hungraim/ltc/governance/controller/BuildBedController.java

@@ -240,13 +240,20 @@ public class BuildBedController {
                 if (chSrvSend.getDisabInfoId() == null || chSrvSend.getSrvOrganId() == null || chSrvSend.getSrvModeId() == null) {
                     return Result.failed("参数不全！");
                 }
+                ChDisableInfo chDisableInfo = disableInfoServie.querySrvModeId(disabInfoId);
+                Integer srvModeId = chDisableInfo.getSrvModeId();
+                Integer exitReasonId = chDisableInfo.getExitReasonId();
+                if(exitReasonId!= null && 1 == exitReasonId){
+                    return Result.failed("该失能人员已死亡退出，不能进行操作");
+                }
+
                 List<ChSrvSend> chSrvSendsList = chSrvSendMapper.selectList(new LambdaQueryWrapper<ChSrvSend>()
                         .eq(ChSrvSend::getDisabInfoId, disabInfoId)
                         .eq(ChSrvSend::getStatus, (short) 1));
                 if (chSrvSendsList.size() > 0) {
                     return Result.failed("已分配护理机构,请先终止或退出再操作");
                 }
-                Integer srvModeId = disableInfoServie.querySrvModeId(disabInfoId);
+
                 Long srvModeId1 = chSrvSend.getSrvModeId();
                 if(srvModeId != srvModeId1.intValue()){
                     String srvModeName = null;

governance/src/main/java/com/hungraim/ltc/governance/service/DisableInfoServie.java

@@ -13,5 +13,5 @@ public interface DisableInfoServie extends IService<ChDisableInfo> {
     Page<DisableInfoVo> querySrvYet(Integer disableInfoId, int current, int limit, Integer status, Integer sendId);
 
 
-    Integer querySrvModeId(Long disabInfoId);
+    ChDisableInfo querySrvModeId(Long disabInfoId);
 }

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

@@ -22,9 +22,9 @@ public class DisableInfoServieImpl extends ServiceImpl<DisableInfoMapper, ChDisa
 
 
     @Override
-    public Integer querySrvModeId(Long disabInfoId){
+    public ChDisableInfo querySrvModeId(Long disabInfoId){
         ChDisableInfo chDisableInfo = baseMapper.selectById(disabInfoId);
         Integer srvModeId = chDisableInfo.getSrvModeId();
-        return srvModeId;
+        return chDisableInfo;
     }
 }