补全缺失字段

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

@@ -91,20 +91,33 @@
 
     <select id="taskReportList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskReportVO">
         SELECT report.REPORT_ID reportId,
+        report.evaluate_time evaluateTime,
         task.APR_ORGAN_ID organId,
         organ.ORGAN_NAME organName,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
+        report.disable_level_id disableLevelId,
         info.REAL_NAME realName,
         info.CERTI_CODE certiCode,
         info.birthday birthday,
         (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
         (SELECT DISE_TYPE_CODE FROM CH_FND_DISEASE_TYPE WHERE info.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
         info.tel tel,
+        info.gender gender,
+        info.disease_desc diseaseDesc,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) disDistrictProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.district_city = dis.DISTRICT_CODE) disDistrictCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.district_area = dis.DISTRICT_CODE) disDistrictArea,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.adress_district_provincial = dis.DISTRICT_CODE) adressDistrictProvincial,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.adress_district_city = dis.DISTRICT_CODE) adressDistrictCity,
+        (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.Adress_district_code = dis.DISTRICT_CODE) adressDistrictCode,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_PROVINCIAL = dis.DISTRICT_CODE) acptProvincial,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE info.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
+        (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,
         lev.RISK_LEVEL riskLevel,
         report.EFF_TIME effTime
         FROM ch_apr_report report

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

@@ -20,10 +20,15 @@ public class TaskReportVO {
     private String districtProvincial;
     private String districPity;
     private String districtArea;
+    //失能等级id
+    private String disableLevelId;
     //失能人员姓名
     private String realName;
     //失能人员身份证号码
     private String certiCode;
+    //评估时间
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date evaluateTime;
     //出生年月
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
@@ -32,10 +37,26 @@ public class TaskReportVO {
     private String diseTypeS;
     //失能人员手机号码
     private String tel;
-    //接受评定地址
+    //失能人员性别
+    private String gender;
+    //失能人员病情描述
+    private String diseaseDesc;
+    //失能人员所在省市区
+    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 acptSrvProvincial;
+    private String acptSrvCity;
+    private String acptSrvArea;
     //评定结果
     private String riskLevel;
     //录入时间