接受服务地址详细地址和接受评定详细地址

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

@@ -34,6 +34,8 @@
         (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,
         (select STREET_NAME from CH_FND_STREET street where disable.ACPT_AREA = street.STREET_CODE) acptStreet,
+        disable.ACPT_SRV_ADDRESS acptSrvAddress,--接受服务地址详细地址
+        disable.ACPT_ADDRESS acptAddress,--接受评定详细地址
         disable.end_time endTime,
         emp.emp_id empId,
         emp.real_name empRealName,
@@ -397,6 +399,7 @@
         apply.gender gender,
         apply.BIRTHDAY birthday,
         apply.certi_code certiCode,
+
         apply.tel tel
         from CH_DISABLE_INFO info
         left join CH_APR_TASK task ON info.LAST_TASK_ID = task.task_id

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

@@ -48,15 +48,20 @@ public class TaskDistributionVO {
     private String adressDistrictProvincial;
     private String adressDistrictCity;
     private String adressDistrictCode;
+
     //接受评定地址省市区街道
     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 acptSrvAddress;
     //评定截止日期
     private Date endTime;
     //评定人员id