Merge remote-tracking branch 'origin/master'

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

@@ -133,6 +133,8 @@
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_provincial = dis.DISTRICT_CODE) acptSrvProvincial,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea,
+        info.ACPT_SRV_ADDRESS acptSrvAddress,--接受服务地址详细地址
+        info.ACPT_ADDRESS acptAddress,--接受评定详细地址
         lev.DISABLE_LEVEL_NAME riskLevel,
         report.EFF_TIME effTime
         FROM ch_apr_report report

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

@@ -60,10 +60,14 @@ public class TaskReportVO {
     private String acptProvincial;
     private String acptCity;
     private String acptArea;
+    //接受评定详细地址
+    private String acptAddress;
     //失能人员接受服务地址
     private String acptSrvProvincial;
     private String acptSrvCity;
     private String acptSrvArea;
+    //接受服务地址详细地址
+    private String acptSrvAddress;
     //评定结果
     private String riskLevel;