补全缺失字段

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

@@ -19,7 +19,15 @@
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
         disable.tel tel,
         disable.gender gender,
-        disable.oper_address operAddress,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) disDistrictProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.district_city = dis.DISTRICT_CODE) disDistrictCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.district_area = dis.DISTRICT_CODE) disDistrictArea,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.adress_district_provincial = dis.DISTRICT_CODE) adressDistrictProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.adress_district_city = dis.DISTRICT_CODE) adressDistrictCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.Adress_district_code = dis.DISTRICT_CODE) adressDistrictCode,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.acpt_srv_provincial = dis.DISTRICT_CODE) acptSrvProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
         (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.ACPT_AREA = dis.DISTRICT_CODE) acptArea,

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/assessment/TaskDistributionVO.java

@@ -36,13 +36,23 @@ public class TaskDistributionVO {
     private String tel;
     //失能人员性别
     private String gender;
-    //现住址省市区街道
-    private String operAddress;
+    //失能人员所在省市区
+    private String disDistrictProvincial;
+    private String disDistrictCity;
+    private String disDistrictArea;
+    //失能人员现住址
+    private String adressDistrictProvincial;
+    private String adressDistrictCity;
+    private String adressDistrictCode;
     //接受评定地址省市区街道
     private String acptProvincial;
     private String acptCity;
     private String acptArea;
     private String acptStreet;
+    //失能人员接受服务地址
+    private String acptSrvProvincial;
+    private String acptSrvCity;
+    private String acptSrvArea;
     //评定截止日期
     private Date endTime;
     //评定人员id