复评申请-历史任务评定信息列表修改

assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/ReTaskController.java

@@ -64,8 +64,8 @@ public class ReTaskController {
      * 复评申请-历史评定信息
      */
     @GetMapping("/hisinfo-list")
-    public Result<List<ChAprTaskVo>> getRetaskHisList(){
-        List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList();
+    public Result<List<ChAprTaskVo>> getRetaskHisList(String disableInfoId){
+         List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList(disableInfoId);
          return Result.success(chAprTaskVos);
     }
 

assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/ReTaskMapper.java

@@ -17,5 +17,5 @@ public interface ReTaskMapper extends BaseMapper<ChAprTask> {
     /**
      * 复评任务评定信息列表
      */
-    List<ChAprTaskVo> getReTaskHisInfoList();
+    List<ChAprTaskVo> getReTaskHisInfoList(String disableInfoId);
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/ReTaskService.java

@@ -24,6 +24,6 @@ public interface ReTaskService extends IService<ChAprTask> {
     /**
      * 复评申请-历史评定信息列表查询
      */
-    List<ChAprTaskVo> geReTaskHisInfoList();
+    List<ChAprTaskVo> geReTaskHisInfoList(String disableInfoId);
 
 }

assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/ReTaskServiceImpl.java

@@ -55,24 +55,9 @@ public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implem
     }
 
     @Override
-    public List<ChAprTaskVo> geReTaskHisInfoList() {
+    public List<ChAprTaskVo> geReTaskHisInfoList(String disableInfoId) {
         // 历史评定信息列表
-        List<ChAprTaskVo> reTaskHisInfoList = reTaskMapper.getReTaskHisInfoList();
-        if (reTaskHisInfoList.size()!=0){
-            reTaskHisInfoList.stream().forEach(item-> {
-                        String provincialCityArea = item.getProvincialCityArea();
-                        provincialCityArea=item.getDistrictProvincial()+item.getDistrictCity()+item.getDistrictArea();
-                        item.setProvincialCityArea(provincialCityArea);
-                try {
-                    item.setAge(DateUtils.getAge(item.getBirthDay()));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                String pcasd = item.getPcasd();
-                pcasd=item.getAcptProvincial()+item.getAcptCity()+item.getAcptArea()+item.getAcptStreet()+item.getAcptAddress();
-                item.setPcasd(pcasd);
-            });
-        }
+        List<ChAprTaskVo> reTaskHisInfoList = reTaskMapper.getReTaskHisInfoList(disableInfoId);
         return reTaskHisInfoList;
     }
 }
\ No newline at end of file

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

@@ -6,20 +6,20 @@
         select
             (select ORGAN_NAME from CH_FND_ORGAN organ where task.ORGAN_ID=organ.ORGAN_ID )organName,
             task.ORGAN_ID organId,
-            (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) districtCity,
-            (select DISTRICT_NAME from CH_FND_DISTRICT dis where task.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
+            task.DISTRICT_PROVINCIAL districtProvincial,
+            task.DISTRICT_CITY districtCity,
+            task.DISTRICT_AREA districtArea,
             disinfo.REAL_NAME realName,
             apply.EFF_TIME effTime,
             disinfo.CERTI_CODE certiCode,
             disinfo.BIRTHDAY birthDay,
-            (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE disease where disinfo.DISEASE=disease.DISE_TYPE_ID) disease,
+            (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE where disinfo.DISE_TYPE_S = DISE_TYPE_ID) diseTypeS,
             disinfo.TEL tel,
-            (select DISTRICT_NAME from CH_FND_DISTRICT dis where disinfo.ACPT_PROVINCIAL= dis.DISTRICT_CODE) acptProvincial,
-            (select DISTRICT_NAME from CH_FND_DISTRICT dis where disinfo.ACPT_CITY = dis.DISTRICT_CODE) acptCity,
-            (select DISTRICT_NAME from CH_FND_DISTRICT dis where disinfo.ACPT_AREA = dis.DISTRICT_CODE) acptArea,
-            (select STREET_NAME from CH_FND_STREET dis where disinfo.ACPT_STREET=dis.STREET_CODE)acptStreet,
-            (select STREET_NAME from CH_FND_STREET dis where disinfo.ACPT_ADDRESS=dis.STREET_CODE)acptAddress,
+            disinfo.ACPT_PROVINCIAL acptProvincial,
+            disinfo.ACPT_CITY acptCity,
+            disinfo.ACPT_AREA acptArea,
+            disinfo.ACPT_STREET acptStreet,
+            disinfo.ACPT_ADDRESS acptAddress,
             (select REAL_NAME from CH_APR_EMP aprEmp where taskEmp.EMP_ID=aprEmp.EMP_ID)EmprealName,
             (select TEL from CH_APR_EMP aprEmp where taskEmp.EMP_ID=aprEmp.EMP_ID)EmpTel,
             task.ASSIGN_TIME assignTime,
@@ -30,6 +30,7 @@
                  left join CH_DISABLE_INFO disinfo on task.DISABLE_INFO_ID=disinfo.DISAB_INFO_ID
                  left join CH_DISABLE_APPLY apply on task.APPLY_ID=apply.APPLY_ID
                  left join CH_APR_TASK_EMP taskEmp on task.TASK_ID=taskEmp.TASK_ID
+        where disinfo.DISAB_INFO_ID = #{disableInfoId}
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -10,6 +10,10 @@ import java.util.Date;
 @Data
 public class ChAprTaskVo {
     /**
+     * 失能人员id
+     */
+    private String disableInfoId;
+    /**
      * 适用机构
      */
     private String organName;
@@ -23,7 +27,6 @@ public class ChAprTaskVo {
     private String districtProvincial;
     private String districtCity;
     private String districtArea;
-    private String provincialCityArea;
     /**
      * 失能人员姓名
      */
@@ -37,10 +40,9 @@ public class ChAprTaskVo {
      */
     private String certiCode;
     /**
-     * 年龄
+     * 出生日期
      */
     private Date birthDay;
-    private Integer age;
     /**
      * 诊断疾病
      */
@@ -57,7 +59,6 @@ public class ChAprTaskVo {
     private String acptArea;
     private String acptStreet;
     private String acptAddress;
-    private String pcasd;
     /**
      * 评定人员
      */