修改失能人员信息修改页面信息详情接口

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

@@ -191,12 +191,12 @@ public class DisableController {
     /**
      * 失能审核信息详情
      *
-     * @param applyId 申请id
-     * @return 失能审核信息详情
+     * @param disabInfoId 失能人员id
+     * @return 失能信息详情
      */
     @RequestMapping("/disableExamineInfo")
-    public Result<DisableExamineInfoVO> disableExamineInfo(String applyId) {
-        DisableExamineInfoVO disableExamineInfoVO = disableService.disableExamineInfo(applyId);
+    public Result<DisableExamineInfoVO> disableExamineInfo(String disabInfoId) {
+        DisableExamineInfoVO disableExamineInfoVO = disableService.disableExamineInfo(disabInfoId);
         return Result.success(disableExamineInfoVO);
     }
 

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

@@ -25,10 +25,10 @@ public interface DisableService {
     /**
      * 失能审核信息详情
      *
-     * @param applyId 申请id
+     * @param disabInfoId 失能人员id
      * @return 失能审核信息详情
      */
-    DisableExamineInfoVO disableExamineInfo(String applyId);
+    DisableExamineInfoVO disableExamineInfo(String disabInfoId);
 
     Result addDisable(ChDisableApply chDisableApply);
 

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

@@ -101,13 +101,14 @@ public class DisableServiceImpl implements DisableService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public DisableExamineInfoVO disableExamineInfo(String applyId) {
-        DisableExamineInfoVO disableExamineInfoVO = disableApplyMapper.selectDisableExamineInfoByApplyId(applyId);
-        List<ExamineRecord> examineRecords = disableApplyMapper.listExamineRecordByApplyId(applyId);
-        disableExamineInfoVO.setExamineRecords(examineRecords);
+    public DisableExamineInfoVO disableExamineInfo(String disabInfoId) {
+        ChDisableInfo chDisableInfo = disableInfoMapper.selectOne(new LambdaQueryWrapper<ChDisableInfo>().eq(ChDisableInfo::getDisabInfoId, disabInfoId));
+        if (chDisableInfo != null) {
+            DisableExamineInfoVO disableExamineInfoVO = new DisableExamineInfoVO();
+            BeanUtils.copyProperties(chDisableInfo, disableExamineInfoVO);
             try {
-            // zhangch 20210525 新增返回对应的附件列表
-            Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(applyId), AttachType.DISABLE.getUploadType());
+                // TODO 需要确认信息表的附件类型
+                Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(disabInfoId), AttachType.DISABLE.getUploadType());
                 if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
                     disableExamineInfoVO.setFileDataList(listResult.getData());
                 } else {
@@ -119,6 +120,8 @@ public class DisableServiceImpl implements DisableService {
             }
             return disableExamineInfoVO;
         }
+        return null;
+    }
 
     @Transactional(rollbackFor = Exception.class)
     @Override

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

@@ -11,8 +11,10 @@ import java.util.List;
  */
 @Data
 public class DisableExamineInfoVO {
-    // 失能人员id
-    private Long applyId;
+    // 失能人员信息id
+    private Integer disabInfoId;
+//    // 失能人员id
+//    private Long applyId;
     //***失能人员个人信息
     //机构
     private String organId;
@@ -60,24 +62,6 @@ public class DisableExamineInfoVO {
     //现住址类型(0：接受评定地址；1：接受服务地址；2：其他)
     private Short addressType;
 
-    //***失能人员医疗及失能信息
-    //诊断疾病
-    private String disease;
-    private Integer diseTypeF;
-    private Integer diseTypeS;
-    //申请服务方式
-    private Integer srvModeId;
-    //病情描述及诊断
-    private String diseaseDesc;
-    //社会保障卡号
-    private String medicalCard;
-    //医保类型
-    private String medicalType;
-    //意向服务机构
-    private Long srvOrganId;
-    //意向服务机构执业许可证登记号
-    private String permitId;
-
     //***代办人信息
     //姓名
     private String operName;
@@ -96,8 +80,6 @@ public class DisableExamineInfoVO {
     private String operStreet;
     private String operAddress;
 
-    //***审核记录
-    private List<ExamineRecord> examineRecords;
 
     //***审核结果
     //审核人
@@ -110,6 +92,6 @@ public class DisableExamineInfoVO {
     private String reasonsReview;
     // 复评备注
     private String reasonsRemark;
-
+    // 附件列表
     private List<ChFndAttach> fileDataList;
 }