长者审核流程（未完成 临时提交）

nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java

@@ -216,14 +216,14 @@ public class ElderApi {
      * @return
      */
     @GetMapping("/queryElders")
-    public Result<List<ElderInfoEntity>> queryElders(@RequestParam("openId") String openId, @RequestParam("elderId") String elderId) {
+    public Result<List<ElderInfoEntity>> queryElders(@RequestParam("openId") String openId, @RequestParam("elderId") String elderId, @RequestParam("orgCode") String orgCode) {
 
-        //护理单元信息
+//        //护理单元信息
-        List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId, elderId);
+//        List<NuBaseElderEntity> nuElderList = nuBaseElderApi.queryByOpenId(openId, elderId);
-        if (nuElderList == null || nuElderList.size() == 0) {
+//        if (nuElderList == null || nuElderList.size() == 0) {
-            return Result.ok(List.of());
+//            return Result.ok(List.of());
-        }
+//        }
-        //查询出机构编码 - 机构名称对应关系
+//        //查询出机构编码 - 机构名称对应关系
         List<JSONObject> jsonObjects = sysBaseAPI.queryOpeDept();
         Map<String, String> codeNameMap = new HashMap<>();
         if (jsonObjects != null && !jsonObjects.isEmpty()) {
@@ -235,26 +235,24 @@ public class ElderApi {
                 }
             }
         }
-
+//
-        //key:orgCode value:nuid逗号拼接的字符串
+//        //key:orgCode value:nuid逗号拼接的字符串
-        Map<String, String> orgCodeToNuIdMap = nuElderList.stream()
+//        Map<String, String> orgCodeToNuIdMap = nuElderList.stream()
-                .filter(entity -> entity.getOrgCode() != null && entity.getNuId() != null)
+//                .filter(entity -> entity.getOrgCode() != null && entity.getNuId() != null)
-                .collect(Collectors.groupingBy(
+//                .collect(Collectors.groupingBy(
-                        NuBaseElderEntity::getOrgCode,
+//                        NuBaseElderEntity::getOrgCode,
-                        Collectors.mapping(NuBaseElderEntity::getNuId, Collectors.joining(","))
+//                        Collectors.mapping(NuBaseElderEntity::getNuId, Collectors.joining(","))
-                ));
+//                ));
-
+//
         List<ElderInfoEntity> result = Lists.newArrayList();
-        for (Map.Entry<String, String> entry : orgCodeToNuIdMap.entrySet()) {
+//        for (Map.Entry<String, String> entry : orgCodeToNuIdMap.entrySet()) {
-            String orgCode = entry.getKey();
+        //切换数据源整理好数据放到返回结果中
-            //切换数据源整理好数据放到返回结果中
+        DynamicDataSourceContextHolder.push(orgCode);
-            DynamicDataSourceContextHolder.push(orgCode);
+        List<ElderInfoEntity> list = elderInfoApi.queryElders(openId, elderId);
-            List<ElderInfoEntity> list = elderInfoApi.queryElders(openId, elderId);
+        result.addAll(list);
-            result.addAll(list);
+        DynamicDataSourceContextHolder.clear();
-            DynamicDataSourceContextHolder.clear();
+//        }
-        }
         result.stream().forEach(d -> {
-            String orgCode = d.getSysOrgCode();
             d.setOrgCode(orgCode);
             d.setDepartName(codeNameMap.get(orgCode));
         });
@@ -278,10 +276,12 @@ public class ElderApi {
             DynamicDataSourceContextHolder.push(elderInfoEntity.getSysOrgCode());
             NuBaseInfoEntity judgeResult = nuBaseInfoApi.queryByElderIdNum(elderInfoEntity.getIdCard());
             if (judgeResult != null) {
+                //这个是老人id跟护理单元还绑定中（认为是还在住）
                 if (StringUtils.isNotBlank(judgeResult.getElderId())) {
                     return Result.error("老人已入住机构，不可重复添加");
                 }
-                if (StringUtils.isNotBlank(judgeResult.getElderTableId())) {
+                //这个是入住任何护理单元 但是有盖老人信息 在业务端会更新长者信息
+                if (StringUtils.isBlank(judgeResult.getElderId()) && StringUtils.isNotBlank(judgeResult.getElderTableId())) {
                     //老人之前在机构入住过
                     id = judgeResult.getElderTableId();
                 }
@@ -306,6 +306,21 @@ public class ElderApi {
      * @param elderInfoEntity
      * @return
      */
+//    @PostMapping("/updateElderInfo")
+//    public Result<?> updateElderInfo(@RequestBody ElderInfoEntity elderInfoEntity) {
+//        elderInfoEntity.setOrgCode(elderInfoEntity.getSysOrgCode());
+//        ElderInfoMQDto mqdto = new ElderInfoMQDto();
+//        BeanUtils.copyProperties(elderInfoEntity, mqdto);
+//        rabbitMQUtil.sendToExchange("hldy.elder", elderInfoEntity.getOrgCode() + ".elder.updateelder", mqdto);
+//        return Result.ok();
+//    }
+
+    /**
+     * 更新长者/监护人信息
+     *
+     * @param elderInfoEntity
+     * @return
+     */
     @PostMapping("/updateElderInfo")
     public Result<?> updateElderInfo(@RequestBody ElderInfoEntity elderInfoEntity) {
         elderInfoEntity.setOrgCode(elderInfoEntity.getSysOrgCode());
@@ -314,5 +329,4 @@ public class ElderApi {
         rabbitMQUtil.sendToExchange("hldy.elder", elderInfoEntity.getOrgCode() + ".elder.updateelder", mqdto);
         return Result.ok();
     }
-
 }

nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java

@@ -215,4 +215,36 @@ public class ElderInfoMQDto implements Serializable {
      * 机构名称
      */
     private String departName;
+    /**
+     * 监护人信息变更状态  1修改申请中 2通过 3驳回
+     */
+    private String guardianModifyStatus;
+
+    /**
+     * 监护人信息变更驳回原因
+     */
+    private String guardianModifyContent;
+
+    /**
+     * 监护人变更信息对应子表id nu_biz_elder_modify_info.id
+     */
+    private String guardianModifyId;
+
+    /**
+     * 长者信息变更状态  1修改申请中 2通过 3驳回
+     */
+    private String elderModifyStatus;
+
+    /**
+     * 长者信息变更驳回原因
+     */
+    private String elderModifyContent;
+
+    /**
+     * 长者变更信息对应子表id nu_biz_elder_modify_info.id
+     */
+    private String elderModifyId;
+
+    //需要变更谁的信息 zz长者 jhr监护人
+    private String modifyType;
 }

nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java

@@ -215,4 +215,36 @@ public class ElderInfoEntity implements Serializable {
      * 机构名称
      */
     private String departName;
+    /**
+     * 监护人信息变更状态  1修改申请中 2通过 3驳回
+     */
+    private String guardianModifyStatus;
+
+    /**
+     * 监护人信息变更驳回原因
+     */
+    private String guardianModifyContent;
+
+    /**
+     * 监护人变更信息对应子表id nu_biz_elder_modify_info.id
+     */
+    private String guardianModifyId;
+
+    /**
+     * 长者信息变更状态  1修改申请中 2通过 3驳回
+     */
+    private String elderModifyStatus;
+
+    /**
+     * 长者信息变更驳回原因
+     */
+    private String elderModifyContent;
+
+    /**
+     * 长者变更信息对应子表id nu_biz_elder_modify_info.id
+     */
+    private String elderModifyId;
+
+    //需要变更谁的信息 zz长者 jhr监护人
+    private String modifyType;
 }

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java

@@ -293,4 +293,46 @@ public class ElderInfo implements Serializable {
      */
     private java.lang.String militaryType;
 
+    /**
+     * 监护人信息变更状态  1修改申请中 2通过 3驳回
+     */
+    @Excel(name = "监护人信息变更状态", width = 20)
+    @ApiModelProperty(value = "监护人信息变更状态  1修改申请中 2通过 3驳回")
+    private String guardianModifyStatus;
+
+    /**
+     * 监护人信息变更驳回原因
+     */
+    @Excel(name = "监护人信息变更驳回原因", width = 30)
+    @ApiModelProperty(value = "监护人信息变更驳回原因")
+    private String guardianModifyContent;
+
+    /**
+     * 监护人变更信息对应子表id nu_biz_elder_modify_info.id
+     */
+    @Excel(name = "监护人变更子表ID", width = 36)
+    @ApiModelProperty(value = "监护人变更信息对应子表id nu_biz_elder_modify_info.id")
+    private String guardianModifyId;
+
+    /**
+     * 长者信息变更状态  1修改申请中 2通过 3驳回
+     */
+    @Excel(name = "长者信息变更状态", width = 20)
+    @ApiModelProperty(value = "长者信息变更状态  1修改申请中 2通过 3驳回")
+    private String elderModifyStatus;
+
+    /**
+     * 长者信息变更驳回原因
+     */
+    @Excel(name = "长者信息变更驳回原因", width = 30)
+    @ApiModelProperty(value = "长者信息变更驳回原因")
+    private String elderModifyContent;
+
+    /**
+     * 长者变更信息对应子表id nu_biz_elder_modify_info.id
+     */
+    @Excel(name = "长者变更子表ID", width = 36)
+    @ApiModelProperty(value = "长者变更信息对应子表id nu_biz_elder_modify_info.id")
+    private String elderModifyId;
+
 }