Merge remote-tracking branch 'origin/master' into master

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

@@ -157,7 +157,34 @@ public class DisableController {
                                                String srvOrganName) {
         Page<DisableVO> page = new Page<>(pageNum, pageSize);
         page = disableService.disableList(page, organId, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, 1);
+        return Result.success(page);
+    }
+
+    /**
+     * 失能人员信息列表
+     *
+     * @param organId            适用机构代码
+     * @param districtProvincial 所在省
+     * @param districtCity       所在市
+     * @param districtArea       所在区域
+     * @param realName           失能人员姓名
+     * @param certiCode          失能人员身份证号码
+     * @param dataFrom           申请来源
+     * @param srvOrganName       护理机构名称
+     * @param pageNum            当前页
+     * @param pageSize           每页几条数据
+     * @return 失能人员信息列表
+     */
+    @RequestMapping("/reApplyList")
+    public Result<Page<DisableVO>> reApplyList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
+                                               String organId, String districtProvincial,
+                                               String districtCity, String districtArea,
+                                               String realName, String certiCode, String dataFrom,
+                                               String srvOrganName) {
+        Page<DisableVO> page = new Page<>(pageNum, pageSize);
+        page = disableService.disableList(page, organId, districtProvincial,
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, 2);
         return Result.success(page);
     }
 

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

@@ -22,8 +22,7 @@ import java.util.List;
 public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
     /**
      * 查询待遇申请管理列表
-     *
-     * @param organIds     机构代码集合
+     *  @param organIds     机构代码集合
      * @param provincial   省
      * @param city         市
      * @param area         区
@@ -31,10 +30,11 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
      * @param certiCode    参保人身份证号码
      * @param dataFrom     申请来源
      * @param srvOrganName 护理机构
+     * @param applyMethod  申请方式(1首次申请、2复评申请、3动态评估)
      */
     Page<DisableVO> disableList(Page<DisableVO> page, List<String> organIds, String provincial,
                                 String city, String area, String name, String certiCode,
-                                String dataFrom, String srvOrganName);
+                                String dataFrom, String srvOrganName, Integer applyMethod);
 
 
     DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId);

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

@@ -19,7 +19,7 @@ public interface DisableService {
 
     Page<DisableVO> disableList(Page<DisableVO> page, String organId, String districtProvincial, String districtCity,
                                 String districtArea, String realName, String certiCode, String dataFrom,
-                                String srvOrganName);
+                                String srvOrganName, Integer applyMethod);
 
     /**
      * 失能审核信息详情

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

@@ -77,19 +77,20 @@ public class DisableServiceImpl implements DisableService {
      * @param certiCode          失能人员身份证号码
      * @param dataFrom           申请来源
      * @param srvOrganName       护理机构名称
+     * @param applyMethod        申请方式(1首次申请、2复评申请、3动态评估)
      * @return list
      */
     @Override
     public Page<DisableVO> disableList(Page<DisableVO> page, String organId, String districtProvincial, String districtCity,
                                        String districtArea, String realName, String certiCode, String dataFrom,
-                                       String srvOrganName) {
+                                       String srvOrganName, Integer applyMethod) {
         // 没有organId参数的时候，这个集合就为null
         List<String> organIds = null;
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
         return disableApplyMapper.disableList(page, organIds, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, applyMethod);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -128,7 +129,7 @@ public class DisableServiceImpl implements DisableService {
             if (chDisableApplies.size() > 0) {
                 return Result.failed("该人员已经进行了首次申请");
             }
-        } else if (Objects.equals(Short.valueOf("1"), applyMethod)) {
+        } else if (Objects.equals(Short.valueOf("2"), applyMethod)) {
             // 复评申请校验
             List<ChDisableApply> chDisableApplies = disableApplyMapper.selectList(new LambdaQueryWrapper<ChDisableApply>()
                     .eq(ChDisableApply::getRealName, chDisableApply.getRealName())

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

@@ -6,9 +6,9 @@
         select a.APPLY_ID applyId,
         o.ORGAN_NAME organName,
         a.organ_id organId,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) provincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_CITY = dis.DISTRICT_CODE) city,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_AREA = dis.DISTRICT_CODE) area,
+        a.DISTRICT_PROVINCIAL provincial,
+        a.DISTRICT_CITY city,
+        a.DISTRICT_AREA area,
         a.REAL_NAME name,
         a.birthday birthday,
         a.CERTI_CODE certiCode,
@@ -19,30 +19,34 @@
         a.tel tel,
         a.fixed_tel fixedTel,
         m.MODE_NAME srvModeName,
-        (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE c WHERE a.DISE_TYPE_S = c.DISE_TYPE_ID) diseTypeS,
+        a.DISE_TYPE_S diseTypeS,
         a.eff_time effTime,
         a.data_from dataFrom,
-        a.APPLY_STATUS applyStatus
+        a.APPLY_STATUS applyStatus,
+        a.APPLY_METHOD applyMethod
         from CH_DISABLE_APPLY a
         LEFT JOIN CH_FND_ORGAN o ON a.organ_id = o.ORGAN_ID
         LEFT JOIN CH_CFG_SRV_MODE m ON a.srv_mode_id = m.MODE_ID
         LEFT JOIN CH_SRV_ORGAN s ON a.SRV_ORGAN_ID = s.SRV_ORGAN_ID
         <where>
-            a.APPLY_METHOD = 1
+
             <if test="organIds != null">
                 and a.organ_id in
                 <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
                     #{organId}
                 </foreach>
             </if>
+            <if test="applyMethod != null and applyMethod != ''">
+                and a.APPLY_METHOD = #{applyMethod}
+            </if>
             <if test="provincial != null and provincial != ''">
-                and (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) = #{provincial}
+                and a.DISTRICT_PROVINCIAL = #{provincial}
             </if>
             <if test="city != null and city != ''">
-                and (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_CITY = dis.DISTRICT_CODE) = #{city}
+                and a.DISTRICT_CITY = #{city}
             </if>
             <if test="area != null and area != ''">
-                and (select DISTRICT_NAME from CH_FND_DISTRICT dis where a.DISTRICT_AREA = dis.DISTRICT_CODE) = #{area}
+                and a.DISTRICT_AREA = #{area}
             </if>
             <if test="name != null and name != ''">
                 and a.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
@@ -113,7 +117,9 @@
 
                a.CHECK_NAME                 checkName,
                a.APPLY_STATUS               applyStatus,
-               a.CHECK_REMARK               checkRemark
+               a.CHECK_REMARK               checkRemark,
+               a.REASONS_REVIEW             reasonsReview,
+               a.REASONS_REMARK             reasonsRemark
         from CH_DISABLE_APPLY a
                  LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
         where a.APPLY_ID = #{applyId}

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

@@ -350,7 +350,7 @@
         apply.certi_code certiCode,
         apply.tel tel
         from CH_DISABLE_INFO info
-        left join CH_APR_TASK task ON info.LAST_TASK_ID = task.id
+        left join CH_APR_TASK task ON info.LAST_TASK_ID = task.task_id
         --适用机构
         left join CH_FND_ORGAN fndOrgan on task.ORGAN_ID = fndOrgan.ORGAN_ID
         --失能申请表

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

@@ -106,6 +106,10 @@ public class DisableExamineInfoVO {
     private String applyStatus;
     //备注
     private String checkRemark;
+    // 复评原因
+    private String reasonsReview;
+    // 复评备注
+    private String reasonsRemark;
 
     private List<ChFndAttach> fileDataList;
 }

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

@@ -49,9 +49,11 @@ public class DisableVO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effTime;
     //申请来源 网厅：0，核心：1，手机端:2,待遇申请:3
-    private String datafrom;
+    private String dataFrom;
     //审核状态
     private String applyStatus;
     //分配状态
     private String status;
+    // 申请类别
+    private Integer applyMethod;
 }