评估录入查看/修改

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

@@ -183,6 +183,20 @@ public class TaskController {
     }
 
     /**
+     * 评估录入查看/修改
+     * @param reportId
+     * @return
+     */
+    @RequestMapping("/getReportById")
+    public Result<TaskReportVO> getReportById(String reportId) {
+        if (StringUtils.isBlank(reportId) && StringUtils.isBlank(reportId)) {
+            return Result.failed("reportId不能为空!");
+        }
+        TaskReportVO taskReportVO = taskService.getReportById(reportId);
+        return Result.success(taskReportVO);
+    }
+
+    /**
      * 评定报告修改
      *
      * @param reportId       评定报告id

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

@@ -44,6 +44,8 @@ public interface TaskMapper extends BaseMapper<ChAprTask> {
      */
     List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
 
+    TaskReportVO getReportById(String reportId);
+
     List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
 
     List<AprEmpVO> aprEmpList(String provincial, String city, String area, String organName, String name, String tel, String groupLeader);

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

@@ -36,6 +36,8 @@ public interface TaskService {
 
     void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark, List<ChFndAttach> fileDataList);
 
+    TaskReportVO getReportById(String reportId);
+
     Result<Object> allotTask(String taskId, String empId);
 
     List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hungraim.ltc.api.AttachFeignService;
 import com.hungraim.ltc.dao.*;
 import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
@@ -179,6 +180,10 @@ public class TaskServiceImpl implements TaskService {
         return Result.success();
     }
 
+    @Override
+    public TaskReportVO getReportById(String reportId) {
+        return taskMapper.getReportById(reportId);
+    }
     /**
      * 评定报告修改
      *

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

@@ -102,6 +102,53 @@
         </where>
     </select>
 
+    <select id="getReportById" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskReportVO">
+        SELECT report.REPORT_ID reportId,
+        report.evaluate_time evaluateTime,
+        task.ORGAN_ID organId,
+        fndOrgan.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,
+        report.pol_no polNo,
+        report.remark remark,
+        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.DISABLE_LEVEL_NAME riskLevel,
+        report.EFF_TIME effTime
+        FROM ch_apr_report report
+        LEFT JOIN CH_APR_TASK task ON report.TASK_ID = task.TASK_ID
+        LEFT JOIN CH_DISABLE_INFO info ON task.disable_info_id = info.disab_info_id
+        left join ch_apr_organ aprOrgan on task.apr_organ_id = aprOrgan.apr_organ_id
+        --left join ch_srv_organ organ on aprOrgan.organ_id = organ.organ_id
+        LEFT JOIN CH_CFG_SRV_DISABLE_LEVEL lev ON report.DISABLE_LEVEL_ID = lev.DISABLE_LEVEL_ID
+        left join CH_FND_ORGAN fndOrgan on task.ORGAN_ID = fndOrgan.ORGAN_ID
+        <where>
+            <if test="reportId != null and reportId != ''">
+                and report.REPORT_ID = #{reportId}
+            </if>
+        </where>
+    </select>
+
     <select id="taskReportList" resultType="com.hungraim.ltc.pojo.vo.assessment.TaskReportVO">
         SELECT report.REPORT_ID reportId,
         report.evaluate_time evaluateTime,