提交修改

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

@@ -191,12 +191,12 @@ public class DisableController {
     /**
      * 失能审核信息详情
      *
-     * @param disabInfoId 失能人员id
+     * @param applyId 失能人员id
      * @return 失能信息详情
      */
     @RequestMapping("/disableExamineInfo")
-    public Result<DisableExamineInfoVO> disableExamineInfo(String disabInfoId) {
-        DisableExamineInfoVO disableExamineInfoVO = disableService.disableExamineInfo(disabInfoId);
+    public Result<DisableExamineInfoVO> disableExamineInfo(String applyId) {
+        DisableExamineInfoVO disableExamineInfoVO = disableService.disableExamineInfo(applyId);
         return Result.success(disableExamineInfoVO);
     }
 
@@ -384,4 +384,16 @@ public class DisableController {
         IPage<SearchDisableSimpleVo> searchDisableSimpleVoIPage = disableService.searchByRealName(pageNum, pageSize, realName);
         return Result.success(searchDisableSimpleVoIPage);
     }
+
+    /**
+     * 失能人员信息详情（失能人员信息修改申请详情页面）
+     *
+     * @param disabInfoId 失能人员id
+     * @return 失能信息详情
+     */
+    @RequestMapping("/disableInfoUpdateDetail")
+    public Result<DisableUpdateDetailVO> disableInfoUpdateDetail(String disabInfoId) {
+        DisableUpdateDetailVO disableUpdateDetailVO = disableService.disableInfoUpdateDetail(disabInfoId);
+        return Result.success(disableUpdateDetailVO);
+    }
 }

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

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

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

@@ -101,16 +101,37 @@ public class DisableServiceImpl implements DisableService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public DisableExamineInfoVO disableExamineInfo(String disabInfoId) {
+    public DisableExamineInfoVO disableExamineInfo(String applyId) {
+        DisableExamineInfoVO disableExamineInfoVO = disableApplyMapper.selectDisableExamineInfoByApplyId(applyId);
+        List<ExamineRecord> examineRecords = disableApplyMapper.listExamineRecordByApplyId(applyId);
+        disableExamineInfoVO.setExamineRecords(examineRecords);
+        try {
+            // zhangch 20210525 新增返回对应的附件列表
+            Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(applyId), AttachType.DISABLE.getUploadType());
+            if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
+                disableExamineInfoVO.setFileDataList(listResult.getData());
+            } else {
+                log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            e.printStackTrace();
+        }
+        return disableExamineInfoVO;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public DisableUpdateDetailVO disableInfoUpdateDetail(String disabInfoId) {
         ChDisableInfo chDisableInfo = disableInfoMapper.selectOne(new LambdaQueryWrapper<ChDisableInfo>().eq(ChDisableInfo::getDisabInfoId, disabInfoId));
         if (chDisableInfo != null) {
-            DisableExamineInfoVO disableExamineInfoVO = new DisableExamineInfoVO();
-            BeanUtils.copyProperties(chDisableInfo, disableExamineInfoVO);
+            DisableUpdateDetailVO disableUpdateDetailVo = new DisableUpdateDetailVO();
+            BeanUtils.copyProperties(chDisableInfo, disableUpdateDetailVo);
             try {
                 // TODO 需要确认信息表的附件类型
                 Result<List<ChFndAttach>> listResult = attachFeignService.selectAttachs(Long.valueOf(disabInfoId), AttachType.DISABLE.getUploadType());
                 if (listResult.getCode().equals(ResultCode.SUCCESS.getCode())) {
-                    disableExamineInfoVO.setFileDataList(listResult.getData());
+                    disableUpdateDetailVo.setFileDataList(listResult.getData());
                 } else {
                     log.info("请求获取附件列表错误：错误码{},错误信息:{}", listResult.getCode(), listResult.getMsg());
                 }
@@ -118,7 +139,7 @@ public class DisableServiceImpl implements DisableService {
                 log.error(e.getMessage());
                 e.printStackTrace();
             }
-            return disableExamineInfoVO;
+            return disableUpdateDetailVo;
         }
         return null;
     }
@@ -380,7 +401,7 @@ public class DisableServiceImpl implements DisableService {
 
     @Override
     public IPage<SearchDisableSimpleVo> searchByRealName(Integer pageNum, Integer pageSize, String realName) {
-        Page<ChDisableInfo> chDisableInfoPage = disableInfoMapper.selectPage(new Page<>(pageNum, pageSize), new LambdaQueryWrapper<ChDisableInfo>().like(ChDisableInfo::getRealName, realName));
+        IPage<ChDisableInfo> chDisableInfoPage = disableInfoMapper.selectPage(new Page<>(pageNum, pageSize), new LambdaQueryWrapper<ChDisableInfo>().like(ChDisableInfo::getRealName, realName));
         return chDisableInfoPage.convert(disableInfo -> {
             SearchDisableSimpleVo searchDisableSimpleVo = new SearchDisableSimpleVo();
             BeanUtils.copyProperties(disableInfo, searchDisableSimpleVo);

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

@@ -11,10 +11,8 @@ import java.util.List;
  */
 @Data
 public class DisableExamineInfoVO {
-    // 失能人员信息id
-    private Integer disabInfoId;
-//    // 失能人员id
-//    private Long applyId;
+    // 失能人员id
+    private Long applyId;
     //***失能人员个人信息
     //机构
     private String organId;
@@ -62,6 +60,24 @@ 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;
@@ -80,6 +96,8 @@ public class DisableExamineInfoVO {
     private String operStreet;
     private String operAddress;
 
+    //***审核记录
+    private List<ExamineRecord> examineRecords;
 
     //***审核结果
     //审核人
@@ -92,6 +110,6 @@ public class DisableExamineInfoVO {
     private String reasonsReview;
     // 复评备注
     private String reasonsRemark;
-    // 附件列表
+
     private List<ChFndAttach> fileDataList;
 }

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

+package com.hungraim.ltc.pojo.vo.disable;
+
+import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 失能审核信息详情VO
+ */
+@Data
+public class DisableUpdateDetailVO {
+    // 失能人员信息id
+    private Integer disabInfoId;
+//    // 失能人员id
+//    private Long applyId;
+    //***失能人员个人信息
+    //机构
+    private String organId;
+    private String organName;
+    //所在省市
+    private String districtProvincial;
+    private String districtCity;
+    private String districtArea;
+    //申请人姓名
+    private String realName;
+    //身份证号码
+    private String certiCode;
+    //出生年月日
+    private Date birthday;
+    //性别
+    private String gender;
+    //手机
+    private String tel;
+    //所在户籍
+    private String regist;
+    //固话
+    private String fixedTel;
+    //待遇类型
+    private String treatmentType;
+    //接受评定地址
+    private String acptProvincial;
+    private String acptCity;
+    private String acptArea;
+    private String acptStreet;
+    private String acptAddress;
+    //接受服务地址
+    private String acptSrvProvincial;
+    private String acptSrvCity;
+    private String acptSrvArea;
+    private String acptSrvStreet;
+    private String acptSrvAddress;
+    //接受服务地址类型(现在址：0,护理机构地址：1,其他：2,接受评定地址：3)
+    private Short acptSrvType;
+    //现住址
+    private String adressDistrictProvincial;
+    private String adressDistrictCity;
+    private String adressDistrictCode;
+    private String street;
+    private String adressDetail;
+    //现住址类型(0：接受评定地址；1：接受服务地址；2：其他)
+    private Short addressType;
+
+    //***代办人信息
+    //姓名
+    private String operName;
+    //身份证号码
+    private String operCertiCode;
+    //手机
+    private String operTel;
+    //与失能人员关系
+    private String operRelation;
+    //代办人固话
+    private String operFixedTel;
+    //现住址
+    private String operDistrictProvince;
+    private String operDistrictCity;
+    private String operDistrictCode;
+    private String operStreet;
+    private String operAddress;
+
+
+    //***审核结果
+    //审核人
+    private String checkName;
+    //审核结果
+    private String applyStatus;
+    //备注
+    private String checkRemark;
+    // 复评原因
+    private String reasonsReview;
+    // 复评备注
+    private String reasonsRemark;
+    // 附件列表
+    private List<ChFndAttach> fileDataList;
+}