复评申请详情

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

@@ -2,10 +2,12 @@ package com.hungraim.ltc.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
+import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
 import com.hungraim.ltc.service.ReTaskService;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -47,5 +49,16 @@ public class ReTaskController {
         page = reTaskService.reTaskDistributionList(page, organId, isIncluded, acptProvincial, acptCity, acptCrea, realName, certiCode, dataFrom, srvOrganId, applyMethod);
         return Result.success(page);
     }
+    /**
+     * 复评申请详情
+     */
+    @GetMapping("/reassmentDetail")
+    public Result reassmentDetailById(String applyId){
+        ChDisableApplyVo chDisableApplyVo = reTaskService.reassmentDetailById(applyId);
+        if (chDisableApplyVo!=null){
+            return Result.success(chDisableApplyVo);
+        }
+        return Result.failed("没有查到该复评申请数据");
+    }
 
 }

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 查询申请表
+ */
+@Mapper
+@Repository
+public interface ChDisableApplyMapper extends BaseMapper<ChDisableApply> {
+    ChDisableApplyVo getReassmentDetailById(String applyId);
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
 import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
+import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,4 +15,9 @@ import org.springframework.stereotype.Service;
 @Service
 public interface ReTaskService extends IService<ChAprTask> {
     Page<ReTaskDistributionVO> reTaskDistributionList(Page<ReTaskDistributionVO> page, Long organId, Boolean isIncluded, String acptProvincial, String acptCity, String acptCrea, String realName, String certiCode, String dataFrom, String srvOrganId, String applyMethod);
+    /**
+     * 复评申请详情
+     */
+    ChDisableApplyVo reassmentDetailById(String applyId);
+
 }

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

 package com.hungraim.ltc.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hungraim.ltc.api.OrganFeignService;
+import com.hungraim.ltc.dao.ChDisableApplyMapper;
 import com.hungraim.ltc.dao.TaskMapper;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
 import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
+import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
 import com.hungraim.ltc.service.ReTaskService;
 import com.hungraim.ltc.util.Result;
 import lombok.AllArgsConstructor;
@@ -20,9 +24,11 @@ import java.util.List;
 @Service
 @Slf4j
 @AllArgsConstructor
-public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implements ReTaskService {
+public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implements  ReTaskService {
     private final TaskMapper taskMapper;
     private final OrganFeignService organFeignService;
+    private final ChDisableApplyMapper disableApplyMapper;
+    private final ChDisableApplyMapper chDisableApplyMapper;
 
     @Override
     public Page<ReTaskDistributionVO> reTaskDistributionList(Page<ReTaskDistributionVO> page, Long organId, Boolean isIncluded, String acptProvincial, String acptCity, String acptCrea, String realName, String certiCode, String dataFrom, String srvOrganId, String applyMethod) {
@@ -37,4 +43,11 @@ public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implem
         }
         return taskMapper.reTaskDistributionList(page, organIds, acptProvincial, acptCity, acptCrea, realName, certiCode, dataFrom, srvOrganId, applyMethod);
     }
+
+    @Override
+    public ChDisableApplyVo reassmentDetailById(String applyId) {
+        ChDisableApplyVo chDisableApplyVo=null;
+        chDisableApplyVo = chDisableApplyMapper.getReassmentDetailById(applyId);
+        return chDisableApplyVo;
+    }
 }
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hungraim.ltc.dao.ChDisableApplyMapper">
+
+    <select id="getReassmentDetailById" resultType="com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo">
+        select
+        apply.APPLY_ID applyId,
+        apply.ORGAN_ID organId,
+        fndOrgan.ORGAN_NAME organName,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_PROVINCIAL= dis.DISTRICT_CODE) districtProvincial,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_CITY = dis.DISTRICT_CODE) districPity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_AREA = dis.DISTRICT_CODE) districtArea,
+        (select STREET_NAME from CH_FND_STREET dis where apply.ACPT_STREET=dis.STREET_CODE)acptStreet,
+        apply.REAL_NAME realName,apply.CERTI_CODE certiCode,apply.BIRTHDAY birthday,apply.GENDER gender,apply.TEL tel,
+        apply.FIXED_TEL fixedTel,apply.REGIST regist,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_SRV_PROVINCIAL= dis.DISTRICT_CODE) acptSrvProvincial,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_SRV_CITY = dis.DISTRICT_CODE) acptSrvCity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ACPT_SRV_AREA = dis.DISTRICT_CODE) acptSrvArea,
+        (select STREET_NAME from CH_FND_STREET dis where apply.ACPT_SRV_STREET=dis.STREET_CODE)acptSrvStreet,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ADRESS_DISTRICT_PROVINCIAL= dis.DISTRICT_CODE) adressDistrictProvincial,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ADRESS_DISTRICT_CITY = dis.DISTRICT_CODE) adressDistrictCity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.ADRESS_DISTRICT_CODE = dis.DISTRICT_CODE) adressDistrictCode,
+        (select STREET_NAME from CH_FND_STREET dis where apply.ADDRESS_ROAD_DETAIL=dis.STREET_CODE)addressRoadDetail,
+
+        (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE cfdt where apply.DISE_TYPE_F = cfdt.DISE_TYPE_ID) diseTypeF,
+        (select DISE_TYPE_CODE from CH_FND_DISEASE_TYPE cfdt where apply.DISE_TYPE_S = cfdt.DISE_TYPE_ID) diseTypeS,
+        (select SRV_MODE_NAME from CH_FND_SRV_MODE cfdt where apply.SRV_MODE_ID=cfdt.SRV_MODE_ID)srvModeName,
+        apply.DISEASE_DESC diseaseDesc,
+        (select MDC_NAME from CH_FND_MEDICAL_TYPE where apply.MEDICAL_TYPE=MDC_TYPE)mdcName,
+        (select SRV_ORGAN_NAME from CH_SRV_ORGAN where apply.SRV_ORGAN_ID=CH_SRV_ORGAN.SRV_ORGAN_ID)srvOrganName,
+        apply.OPER_NAME operName,apply.OPER_CERTI_CODE operCertiCode,apply.OPER_TEL operTel,apply.OPER_RELATION operRelation,
+        apply.OPER_FIXED_TEL operFixedTel,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.OPER_DISTRICT_PROVINCE= dis.DISTRICT_CODE) operDistrictProvince,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.OPER_DISTRICT_CITY = dis.DISTRICT_CODE) operDistrictCity,
+        (select DISTRICT_NAME from CH_FND_DISTRICT dis where apply.OPER_DISTRICT_CODE = dis.DISTRICT_CODE) operDistrictCode,
+        (select STREET_NAME from CH_FND_STREET dis where apply.OPER_ROAD_DETAIL=dis.STREET_CODE)operRoadDetail,
+        apply.REASONS_REVIEW reasonsReview,
+        apply.APPLY_STATUS applyStatus,
+        (select APL_STATUS_NAME from CH_FND_APPLY_STATUS_TYPE where apply.APPLY_STATUS=APL_STATUS_TYPE)applyStatusName,
+        apply.REASONS_REMARK reasonsRemark
+        from CH_DISABLE_APPLY apply
+        left join CH_FND_ORGAN fndOrgan on apply.ORGAN_ID=fndOrgan.ORGAN_ID
+        where apply.APPLY_ID = #{applyId}
+    </select>
+
+</mapper>
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/ChDisableApplyVo.java

+package com.hungraim.ltc.pojo.vo.disable;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 申请表vo
+ */
+@Data
+public class ChDisableApplyVo {
+    /**
+     * 机构代码
+     */
+    private String organId;
+    /**
+     * 机构名
+     */
+    private String organName;
+
+    /**
+     * 所在省份
+     */
+    private String districtProvincial;
+
+    /**
+     * 所在城市
+     */
+    private String districtCity;
+
+    /**
+     * 所在区域
+     */
+    private String districtArea;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 身份证号
+     */
+    private String certiCode;
+
+    /**
+     * 出生年月
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date birthday;
+
+    /**
+     * 性别    男：M；女：F；不确定 N
+     */
+    private String gender;
+
+    /**
+     * 电话
+     */
+    private String tel;
+    /**
+     * 失能人员电话
+     */
+    private String fixedTel;
+    /**
+     * 户籍   本市：0；非本市：1
+     */
+    private Short regist;
+    /**
+     * 待遇类型(1失能、0失智)
+     */
+    private Short treatmentType;
+    /**
+     * 接受评定省
+     */
+    private String acptProvincial;
+
+    /**
+     * 接受评定市
+     */
+    private String acptCity;
+
+    /**
+     * 接受评定区
+     */
+    private String acptArea;
+
+    /**
+     * 接受评定街道
+     */
+    private String acptStreet;
+
+    /**
+     * 接受评定详细地址
+     */
+    private String acptAddress;
+
+    /**
+     * 接受评定类型 现在址：0,机构地址：1,其他：2
+     */
+    private Short acptType;
+    /**
+     * 接受服务地址省
+     */
+    private String acptSrvProvincial;
+
+    /**
+     * 接受服务地址市
+     */
+    private String acptSrvCity;
+
+    /**
+     * 接受服务地址区
+     */
+    private String acptSrvArea;
+
+    /**
+     * 接受服务地址街道
+     */
+    private String acptSrvStreet;
+    /**
+     * 接受服务地址详细地址
+     */
+    private String acptSrvAddress;
+    /**
+     * 接受服务地址类型(现在址：0,护理机构地址：1,其他：2,接受评定地址：3)
+     */
+    private Short acptSrvType;
+    //失能人员现住址
+    private String adressDistrictProvincial;
+    private String adressDistrictCity;
+    private String adressDistrictCode;
+    private String addressRoadDetail;
+    private String adressDetail;
+    private Short addressType;
+
+    /**
+     * 诊断疾病
+     */
+    private String diseTypeF;//大类
+    private String diseTypeS;//小类
+
+    /**
+     * 服务方式
+     */
+    private Long srvModeId;
+    /**
+     * 服务方式名称
+     */
+    private String srvModeName;
+
+    /**
+     * 疾病描述
+     */
+    private String diseaseDesc;
+
+    /**
+     * 医保类型    城镇：1；非城镇：0
+     */
+    private Short medicalType;
+    /**
+     * 医保类型名称
+     */
+    private String mdcName;
+
+    /**
+     * 社保卡号
+     */
+    private String medicalCard;
+
+    /**
+     * 意向护理机构
+     */
+    private Long srvOrganId;
+    private String srvOrganName;
+    /**
+     * 代办人姓名
+     */
+    private String operName;
+
+    /**
+     * 代办人身份证号
+     */
+    private String operCertiCode;
+
+    /**
+     * 代办人手机号
+     */
+    private String operTel;
+
+    /**
+     * 与失能人员关系    子女:0;父母:1配偶:2其他:3
+     */
+    private String operRelation;
+    /**
+     * 代办人固话
+     */
+    private String operFixedTel;
+    /**
+     * 代办人住址省份
+     */
+    private String operDistrictProvince;
+
+    /**
+     * 代办人住址城市
+     */
+    private String operDistrictCity;
+    /**
+     * 代办人住址区域
+     */
+    private String operDistrictCode;
+    /**
+     * 代办人现住止路街
+     */
+    private String operRoadDetail;
+    /**
+     * 代办人住址详情
+     */
+    private String operAddress;
+    /**
+     * 复评原因
+     */
+    private String reasonsReview;
+
+    /**
+     * 复评备注
+     */
+    private String reasonsRemark;
+    /**
+     * 审核人
+     */
+    private String checkName;
+    /**
+     * 申请状态   未提交:0;待审核:1;审核通过:2;不通过：3;删除:4;撤销:5
+     */
+    private Short applyStatus;
+    private String applyStatusName;
+    /**
+     * 审核备注
+     */
+    private String checkRemark;
+
+
+
+}