添加确实字段

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

@@ -8,9 +8,9 @@
         task.apply_id applyId,
         organ.organ_name organName,
         task.apr_organ_id aprOrganId,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where organ.DISTRICT_PROVINCIAL = dis.DISTRICT_CODE) districtProvincial,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where organ.DISTRICT_CITY = dis.DISTRICT_CODE) districPity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where organ.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
         disable.real_name realName,
         task.fcd fcd,
         disable.certi_code certiCode,
@@ -18,13 +18,19 @@
         (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disable.DISE_TYPE_F = DISE_TYPE_ID) diseTypeF,
         (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 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,
         (select STREET_NAME from CH_FND_STREET street where disable.ACPT_AREA = street.STREET_CODE) acptStreet,
         disable.end_time endTime,
+        emp.emp_id empId,
         emp.real_name empRealName,
         emp.tel empTel,
+        emp.certi_code empCertiCode,
+        emp.apr_organ_id empAprOrganId,
+        (select organ_name from ch_apr_organ o1 where emp.apr_organ_id = o1.apr_organ_id) empOrganName,
         task.assign_time assignTime,
         task.accept_time acceptTime,
         task.finish_time finishTime,
@@ -92,6 +98,7 @@
         (SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
         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,

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

@@ -15,7 +15,7 @@ public class TaskDistributionVO {
     private String organName;
     //机构代码
     private String aprOrganId;
-    //所在省市区
+    //机构所在省市区
     private String districtProvincial;
     private String districPity;
     private String districtArea;
@@ -34,18 +34,29 @@ public class TaskDistributionVO {
     private String diseTypeS;//小类
     //失能人员联系电话
     private String tel;
-    //接受评定地址
+    //失能人员性别
+    private String gender;
+    //现住址省市区街道
+    private String operAddress;
+    //接受评定地址省市区街道
     private String acptProvincial;
     private String acptCity;
     private String acptArea;
-    //街道
     private String acptStreet;
     //评定截止日期
     private Date endTime;
-    //评定人员
+    //评定人员id
+    private Integer empId;
+    //评定人员姓名
     private String empRealName;
     //评定人员手机号码
     private String empTel;
+    //评定人员身份证号
+    private String empCertiCode;
+    //评定人员所属机构id
+    private String empAprOrganId;
+    //评定人员所属机构名称
+    private String empOrganName;
     //任务分配时间
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date assignTime;

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

@@ -24,6 +24,9 @@ public class TaskReportVO {
     private String realName;
     //失能人员身份证号码
     private String certiCode;
+    //出生年月
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
     //诊断疾病
     private String diseTypeF;
     private String diseTypeS;