Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

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

@@ -365,10 +365,10 @@ public class DisableController {
      * 通过身份证搜索
      */
     @GetMapping("/searchByCertifNum")
-    public Result<ChDisableInfo> searchByCertifNum(String certifNum){
-        ChDisableInfo chDisableInfo = disableService.searchChangeByCertifNum(certifNum);
-        if (chDisableInfo!=null){
-            return Result.success(chDisableInfo);
+    public Result<DisableInfoChangeDetailVo> searchByCertifNum(String certifNum){
+        DisableInfoChangeDetailVo disableInfoChangeDetailVo = disableService.searchChangeByCertifNum(certifNum);
+        if (disableInfoChangeDetailVo!=null){
+            return Result.success(disableInfoChangeDetailVo);
         }
         return Result.failed("数据不一致");
     }

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

@@ -14,4 +14,8 @@ public interface ChDisableInfoChangeMapper extends BaseMapper<ChDisableInfoChang
      */
     List<DisableInfoChangeVo> getListDisableInfoChange(String organId,String districtProvince,boolean ishasLowOrgan
             ,String districtCity,String districtArea,String realName,String certifNum,String aplOrganId,Short applyStatus);
+    /**
+     * 失能信息变更-查看修改
+     */
+
 }

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

@@ -118,5 +118,5 @@ public interface DisableService {
     /**
      * 失能人员信息变更-查看修改
      */
-    ChDisableInfo searchChangeByCertifNum(String certifNum);
+    DisableInfoChangeDetailVo searchChangeByCertifNum(String certifNum);
 }

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

@@ -377,9 +377,13 @@ public class DisableServiceImpl implements DisableService {
     }
 
     @Override
-    public ChDisableInfo searchChangeByCertifNum(String certifNum) {
-
-       return disableInfoMapper.selectOne(new LambdaQueryWrapper<ChDisableInfo>().eq(ChDisableInfo::getCertiCode,certifNum));
-
+    public DisableInfoChangeDetailVo searchChangeByCertifNum(String certifNum) {
+        ChDisableInfo chDisableInfo = disableInfoMapper.selectOne(new LambdaQueryWrapper<ChDisableInfo>().eq(ChDisableInfo::getCertiCode, certifNum));
+        DisableInfoChangeDetailVo disableInfoChangeDetailVo=null;
+        if (chDisableInfo!=null) {
+            disableInfoChangeDetailVo = new DisableInfoChangeDetailVo();
+            BeanUtil.copyProperties(chDisableInfo, disableInfoChangeDetailVo);
+        }
+        return disableInfoChangeDetailVo;
     }
 }
\ No newline at end of file

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

+package com.hungraim.ltc.pojo.vo.disable;
+
+import lombok.Data;
+
+@Data
+public class DisableInfoChangeDetailVo {
+    /**
+     * 机构代码
+     */
+    private String organId;
+    /**
+     * 机构名称
+     */
+    private String organName;
+
+    /**
+     * 所在省份
+     */
+    private String districtProvince;
+
+    /**
+     * 所在城市
+     */
+    private String districtCity;
+
+    /**
+     * 所在区
+     */
+    private String districtArea;
+    /**
+     * 失能人员姓名
+     */
+    private String realName;
+    /**
+     * 身份证号
+     */
+
+    private String certifNum;
+    /**
+     * 出生年月
+     */
+    private String birthday;
+    /**
+     * 性别
+     */
+    private String gender;
+    /**
+     * 手机号码
+     */
+    private String Tel;
+    /**
+     * 所在户籍
+     */
+    private Short regist;
+    /**
+     * 接受评定地址
+     */
+    private String acptProvincial;
+    private String acptCity;
+    private String acptArea;
+    private String acptStreet;
+    private String acptRoadDetail;
+    private Short acptType;
+    /**
+     * 接受服务地址
+     */
+    private String acptSrvProvincial;
+    private String acptSrvCity;
+    private String acptSrvArea;
+    private String acptSrvStreet;
+    private String acptSrvRoadDetail;
+    private String acptSrvType;
+    /**
+     * 现住址
+     */
+    private String addressProvincial;
+    private String addressCity;
+    private String addressArea;
+    private String addressStreet;
+    private String addressRoadDetail;
+    /**
+     * 代办人
+     */
+    private String operName;
+    /**
+     * 代办人身份证
+     */
+    private String operCertiNum;
+    /**
+     * 联系电话
+     */
+    private String operTel;
+    /**
+     * 与失能人员关系
+     */
+    private Short operRelation;
+    /**
+     * 代办人现住址
+     */
+    private String operProvincial;
+    private String operCity;
+    private String operArea;
+    private String operStreet;
+    private String operAddress;
+    /**
+     * 变更原因说明
+     */
+    private String changeReason;
+    /**
+     * 审核人
+     */
+    private String checkName;
+    /**
+     * 审核结果
+     */
+    private short applyStatus;
+    /**
+     * 备注
+     */
+    private String checkRemark;
+
+
+}