Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

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

@@ -64,10 +64,17 @@ public class ReTaskController {
      * 复评申请-历史评定信息
      */
     @GetMapping("/hisinfo-list")
-    public Result<List<ChAprTaskVo>> getRetaskHisList(){
-        List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList();
-        return Result.success(chAprTaskVos);
+    public Result<List<ChAprTaskVo>> getRetaskHisList(String disableInfoId){
+         List<ChAprTaskVo> chAprTaskVos = reTaskService.geReTaskHisInfoList(disableInfoId);
+         return Result.success(chAprTaskVos);
+    }
+    /**
+     * 复评审核
+     */
+    @RequestMapping("/disableExamine")
+    public Result disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
+        reTaskService.disableExamine(applyId, checkName, applyStatus, checkRemark);
+        return Result.success();
     }
-
 
 }

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能评定Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface AprTaskMapper extends BaseMapper<ChAprTask> {
+}

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 基础参数配置Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface CfgParaMapper extends BaseMapper<ChCfgPara> {
+
+}

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> {
+}

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

+package com.hungraim.ltc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hungraim.ltc.pojo.entity.assessment.ChDisableInfoHis;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 失能人员信息Mapper
+ *
+ * @author czz
+ */
+@Mapper
+@Repository
+public interface DisableInfoHisMapper extends BaseMapper<ChDisableInfoHis> {
+}

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,10 @@ public interface ReTaskService extends IService<ChAprTask> {
     /**
      * 复评申请-历史评定信息列表查询
      */
-    List<ChAprTaskVo> geReTaskHisInfoList();
+    List<ChAprTaskVo> geReTaskHisInfoList(String disableInfoId);
 
+    /**
+     * 复评审核
+     */
+    void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark);
 }

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.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.ReTaskMapper;
-import com.hungraim.ltc.dao.TaskMapper;
+import com.hungraim.ltc.dao.*;
 import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
+import com.hungraim.ltc.pojo.entity.assessment.ChDisableInfoHis;
 import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis;
+import com.hungraim.ltc.pojo.entity.disable.ChDisableInfo;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
 import com.hungraim.ltc.pojo.vo.assessment.ChAprTaskVo;
 import com.hungraim.ltc.pojo.vo.assessment.ReTaskDistributionVO;
 import com.hungraim.ltc.pojo.vo.disable.ChDisableApplyVo;
@@ -16,8 +21,11 @@ import com.hungraim.ltc.util.DateUtils;
 import com.hungraim.ltc.util.Result;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -33,6 +41,11 @@ public class ReTaskServiceImpl extends ServiceImpl<TaskMapper, ChAprTask> implem
     private final ChDisableApplyMapper disableApplyMapper;
     private final ChDisableApplyMapper chDisableApplyMapper;
     private final ReTaskMapper reTaskMapper;
+    private final DisableApplyHisMapper disableApplyHisMapper;
+    private final CfgParaMapper cfgParaMapper;
+    private final AprTaskMapper aprTaskMapper;
+    private final DisableInfoMapper disableInfoMapper;
+    private final DisableInfoHisMapper disableInfoHisMapper;
     @Override
     public Page<ReTaskDistributionVO> reTaskDistributionList(Page<ReTaskDistributionVO> page, Long organId, Boolean isIncluded, String acptProvincial, String acptCity, String acptCrea, String realName, String certiCode) {
         Result<List<Long>> organChild = null;
@@ -55,24 +68,63 @@ 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;
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
+        Date date = new Date();
+        //更新审核状态
+        ChDisableApply chDisableApply = disableApplyMapper.selectById(applyId);
+        chDisableApply.setCheckName(checkName);//审核人
+        chDisableApply.setApplyStatus(applyStatus);//申请状态
+        chDisableApply.setCheckRemark(checkRemark);//审核备注
+        chDisableApply.setCheckTime(date);//审核时间
+        disableApplyMapper.updateById(chDisableApply);
+        //添加失能审核历史
+        ChDisableApplyHis chDisableApplyHis = new ChDisableApplyHis();
+        BeanUtils.copyProperties(chDisableApply, chDisableApplyHis);
+        disableApplyHisMapper.insert(chDisableApplyHis);
+        //审核通过
+        if (applyStatus.equals(Short.valueOf("2"))) {
+            //修改失能人员信息，首次申请只需新建
+            ChDisableInfo chDisableInfo = disableInfoMapper.selectOne(new LambdaQueryWrapper<ChDisableInfo>()
+                    .eq(ChDisableInfo::getRealName, checkName)
+                    .eq(ChDisableInfo::getCertiCode, chDisableApply.getCertiCode()));
+            BeanUtil.copyProperties(chDisableApply, chDisableInfo);
+            chDisableInfo.setDataFrom(0);//数据来源设置为0-申请
+            disableInfoMapper.updateById(chDisableInfo);
+
+/*          //添加失能人员信息
+            ChDisableInfo chDisableInfo = new ChDisableInfo();
+            BeanUtil.copyProperties(chDisableApply, chDisableInfo);
+            disableInfoMapper.insert(chDisableInfo);*/
+            //新建disable_info_his表的一条数据
+            ChDisableInfoHis chDisableInfoHis = new ChDisableInfoHis();
+            BeanUtil.copyProperties(chDisableInfo, chDisableInfoHis);
+            disableInfoHisMapper.insert(chDisableInfoHis);
+
+            //添加失能评定信息
+            ChAprTask chAprTask = new ChAprTask();
+            ChCfgPara chCfgPara = cfgParaMapper.selectOne(new QueryWrapper<ChCfgPara>().eq("ORGAN_ID", chDisableApply.getOrganId()));
+            if (chCfgPara != null && chCfgPara.getCfgArgTime() != null) {
+                Calendar cd = Calendar.getInstance();
+                cd.setTime(date);
+                cd.add(Calendar.DATE, chCfgPara.getCfgArgTime().intValue());
+                chAprTask.setLastAprDate(cd.getTime());//鉴定截至日期
+            }
+            BeanUtil.copyProperties(chDisableApply, chAprTask);
+            chAprTask.setDisableInfoId(chDisableInfo.getDisabInfoId());//失能人员id
+            chAprTask.setReAprStatus(0);
+            chAprTask.setEffTime(new Date());
+            chAprTask.setFcd(null);
+            chAprTask.setAprType(1);//申请：0；复评：1
+            chAprTask.setTaskStatus(0); // 任务状态 0 未分配
+            aprTaskMapper.insert(chAprTask);
+        }
+    }
 }
\ 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/entity/assessment/ChDisableInfoHis.java

+package com.hungraim.ltc.pojo.entity.assessment;
+
+import java.io.Serializable;
+
+/**
+ * (ChDisableInfoHis)实体类
+ *
+ * @author makejava
+ * @since 2021-09-02 13:35:48
+ */
+public class ChDisableInfoHis implements Serializable {
+    private static final long serialVersionUID = 202562564087527572L;
+    
+    private Object hisDisabInfoId;
+    
+    private Object disabInfoId;
+    
+    private Object organId;
+    
+    private Object districtProvincial;
+    
+    private Object districtCity;
+    
+    private Object districtArea;
+    
+    private Object realName;
+    
+    private Object certiCode;
+    
+    private Object birthday;
+    
+    private Object gender;
+    
+    private Object tel;
+    
+    private Object adressDistrictCode;
+    
+    private Object adressDetail;
+    
+    private Object regist;
+    
+    private Object disease;
+    
+    private Object srvModeId;
+    
+    private Object diseaseDesc;
+    
+    private Object medicalType;
+    
+    private Object medicalCard;
+    
+    private Object srvOrganIntent;
+    
+    private Object operName;
+    
+    private Object operCertiCode;
+    
+    private Object operTel;
+    
+    private Object operRelation;
+    
+    private Object operDistrictCode;
+    
+    private Object operAddress;
+    
+    private Object aprConfY;
+    
+    private Object applyStatus;
+    
+    private Object checkName;
+    
+    private Object checkRemark;
+    
+    private Object checkTime;
+    
+    private Object reason;
+    
+    private Object defineEmg;
+    
+    private Object effTime;
+    
+    private Object endEmg;
+    
+    private Object endTime;
+    
+    private Object fcd;
+    
+    private Object fcu;
+    
+    private Object lcd;
+    
+    private Object lcu;
+    
+    private Object aplOrganId;
+    
+    private Object adressDistrictProvincial;
+    
+    private Object adressDistrictCity;
+    
+    private Object operDistrictProvincial;
+    
+    private Object operDistrictCity;
+    
+    private Object lastTaskId;
+    
+    private Object hisFcd;
+    
+    private Object hisFcu;
+    
+    private Object hisLcd;
+    
+    private Object hisLcu;
+    
+    private Object street;
+    
+    private Object aprTotalScore;
+    
+    private Object applyId;
+    /**
+    * 服务配置模式ID
+    */
+    private Object cfgModeId;
+    /**
+    * 接受评定省
+    */
+    private Object acptProvincial;
+    /**
+    * 接受评定市
+    */
+    private Object acptCity;
+    /**
+    * 接受评定区
+    */
+    private Object acptArea;
+    /**
+    * 接受评定街道
+    */
+    private Object acptStreet;
+    /**
+    * 接受评定详细地址
+    */
+    private Object acptAddress;
+    /**
+    * 接受评定类型 现在址：0,机构地址：1,其他：2
+    */
+    private Object acptType;
+    /**
+    * 疾病大类
+    */
+    private Object diseTypeF;
+    /**
+    * 疾病小类
+    */
+    private Object diseTypeS;
+    /**
+    * 历史操作时间
+    */
+    private Object hisTime;
+    /**
+    * 历史操作人
+    */
+    private Object hisEmp;
+    /**
+    * 现住址经度
+    */
+    private Object addressLongitude;
+    /**
+    * 现住址纬度
+    */
+    private Object addressLatitude;
+    /**
+    * 接受评定地址经度
+    */
+    private Object acptLongitude;
+    /**
+    * 接受评定地址纬度
+    */
+    private Object acptLatitude;
+    /**
+    * 代办人街道
+    */
+    private Object operStreet;
+    /**
+    * 代办人地址经度
+    */
+    private Object agentLongitude;
+    /**
+    * 代办人地址纬度
+    */
+    private Object agentLatitude;
+    /**
+    * 现住地址路街
+    */
+    private Object addressRoadDetail;
+    /**
+    * 现住地址路/街（0路，1街，2村）
+    */
+    private Object addressRoadType;
+    /**
+    * 现住地址号弄
+    */
+    private Object addressNumberDetail;
+    /**
+    * 现住地址号/弄（0弄，1号）
+    */
+    private Object addressNumberType;
+    /**
+    * 接受评定地址路街
+    */
+    private Object acptRoadDetail;
+    /**
+    * 接受评定地址路/街（0路，1街，2村）
+    */
+    private Object acptRoadType;
+    /**
+    * 接受评定地址号弄
+    */
+    private Object acptNumberDetail;
+    /**
+    * 接受评定地址号/弄（0弄，1号）
+    */
+    private Object acptNumberType;
+    /**
+    * 代办人现住止路街
+    */
+    private Object operRoadDetail;
+    /**
+    * 代办人现住止路/街（0路，1街，2村）
+    */
+    private Object operRoadType;
+    /**
+    * 代办人现住止号弄
+    */
+    private Object operNumberDetail;
+    /**
+    * 代办人现住止号/弄（0弄，1号）
+    */
+    private Object operNumberType;
+    /**
+    * 接受服务地址省
+    */
+    private Object acptSrvProvincial;
+    /**
+    * 接受服务地址市
+    */
+    private Object acptSrvCity;
+    /**
+    * 接受服务地址区
+    */
+    private Object acptSrvArea;
+    /**
+    * 接受服务地址街道
+    */
+    private Object acptSrvStreet;
+    /**
+    * 接受服务地址路街
+    */
+    private Object acptSrvRoadDetail;
+    /**
+    * 接受服务地址路/街（0路，1街，2村）
+    */
+    private Object acptSrvRoadType;
+    /**
+    * 接受服务地址号弄
+    */
+    private Object acptSrvNumberDetail;
+    /**
+    * 接受服务地址号/弄（0弄，1号）
+    */
+    private Object acptSrvNumberType;
+    /**
+    * 接受服务地址详细地址
+    */
+    private Object acptSrvAddress;
+    /**
+    * 接受服务地址类型（现在址：0,护理机构地址：1,其他：2）
+    */
+    private Object acptSrvType;
+    /**
+    * 接受服务地址经度
+    */
+    private Object acptSrvLongitude;
+    /**
+    * 接受服务地址纬度
+    */
+    private Object acptSrvLatitude;
+    /**
+    * 数据来源（申请：0，信息变更：1）
+    */
+    private Object dataFrom;
+    /**
+    * 失能人员固话
+    */
+    private Object fixedTel;
+    /**
+    * 代办人固话
+    */
+    private Object operFixedTel;
+    /**
+    * 所在户籍地址省
+    */
+    private Object registProvincial;
+    /**
+    * 所在户籍地址市
+    */
+    private Object registCity;
+    /**
+    * 所在户籍地址区
+    */
+    private Object registArea;
+    /**
+    * 所在户籍地址街道
+    */
+    private Object registStreet;
+    /**
+    * 所在户籍地址详细地址
+    */
+    private Object registAddress;
+    /**
+    * 所在户籍地址经度
+    */
+    private Object registLongitude;
+    /**
+    * 所在户籍地址纬度
+    */
+    private Object registLatitude;
+    /**
+    * 1病史简述1   . 曾患的重大疾病、外伤史、传染病史
+    */
+    private Object medicalHistory1;
+    /**
+    * 病史简述2   2. 现有的疾病和病症
+    */
+    private Object medicalHistory2;
+    /**
+    * 病史简述3   3. 目前正在治疗的疾病和病症
+    */
+    private Object medicalHistory3;
+    /**
+    * 身高
+    */
+    private Object height;
+    /**
+    * 体重
+    */
+    private Object weight;
+    /**
+    * 左手握力
+    */
+    private Object leftHandGrip;
+    /**
+    * 右手握力
+    */
+    private Object rightHandGrip;
+    /**
+    * 肢体残缺  0有，1无
+    */
+    private Object bodyIncomplete;
+    /**
+    * 视力障碍   0有，1无
+    */
+    private Object visionObstacle;
+    /**
+    * 听力障碍   0有，1无
+    */
+    private Object hearingObstacle;
+    /**
+    * 病史简述
+    */
+    private Object medicalHistory;
+    /**
+    * 医师姓名
+    */
+    private Object doctorName;
+    /**
+    * 医师证件号码
+    */
+    private Object doctorNumber;
+    /**
+    * 是否跨区，0不跨区，1跨区
+    */
+    private Object crossDistrict;
+    /**
+    * 待遇类型（1失能、0失智）
+    */
+    private Object treatmentType;
+
+
+    public Object getHisDisabInfoId() {
+        return hisDisabInfoId;
+    }
+
+    public void setHisDisabInfoId(Object hisDisabInfoId) {
+        this.hisDisabInfoId = hisDisabInfoId;
+    }
+
+    public Object getDisabInfoId() {
+        return disabInfoId;
+    }
+
+    public void setDisabInfoId(Object disabInfoId) {
+        this.disabInfoId = disabInfoId;
+    }
+
+    public Object getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Object organId) {
+        this.organId = organId;
+    }
+
+    public Object getDistrictProvincial() {
+        return districtProvincial;
+    }
+
+    public void setDistrictProvincial(Object districtProvincial) {
+        this.districtProvincial = districtProvincial;
+    }
+
+    public Object getDistrictCity() {
+        return districtCity;
+    }
+
+    public void setDistrictCity(Object districtCity) {
+        this.districtCity = districtCity;
+    }
+
+    public Object getDistrictArea() {
+        return districtArea;
+    }
+
+    public void setDistrictArea(Object districtArea) {
+        this.districtArea = districtArea;
+    }
+
+    public Object getRealName() {
+        return realName;
+    }
+
+    public void setRealName(Object realName) {
+        this.realName = realName;
+    }
+
+    public Object getCertiCode() {
+        return certiCode;
+    }
+
+    public void setCertiCode(Object certiCode) {
+        this.certiCode = certiCode;
+    }
+
+    public Object getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Object birthday) {
+        this.birthday = birthday;
+    }
+
+    public Object getGender() {
+        return gender;
+    }
+
+    public void setGender(Object gender) {
+        this.gender = gender;
+    }
+
+    public Object getTel() {
+        return tel;
+    }
+
+    public void setTel(Object tel) {
+        this.tel = tel;
+    }
+
+    public Object getAdressDistrictCode() {
+        return adressDistrictCode;
+    }
+
+    public void setAdressDistrictCode(Object adressDistrictCode) {
+        this.adressDistrictCode = adressDistrictCode;
+    }
+
+    public Object getAdressDetail() {
+        return adressDetail;
+    }
+
+    public void setAdressDetail(Object adressDetail) {
+        this.adressDetail = adressDetail;
+    }
+
+    public Object getRegist() {
+        return regist;
+    }
+
+    public void setRegist(Object regist) {
+        this.regist = regist;
+    }
+
+    public Object getDisease() {
+        return disease;
+    }
+
+    public void setDisease(Object disease) {
+        this.disease = disease;
+    }
+
+    public Object getSrvModeId() {
+        return srvModeId;
+    }
+
+    public void setSrvModeId(Object srvModeId) {
+        this.srvModeId = srvModeId;
+    }
+
+    public Object getDiseaseDesc() {
+        return diseaseDesc;
+    }
+
+    public void setDiseaseDesc(Object diseaseDesc) {
+        this.diseaseDesc = diseaseDesc;
+    }
+
+    public Object getMedicalType() {
+        return medicalType;
+    }
+
+    public void setMedicalType(Object medicalType) {
+        this.medicalType = medicalType;
+    }
+
+    public Object getMedicalCard() {
+        return medicalCard;
+    }
+
+    public void setMedicalCard(Object medicalCard) {
+        this.medicalCard = medicalCard;
+    }
+
+    public Object getSrvOrganIntent() {
+        return srvOrganIntent;
+    }
+
+    public void setSrvOrganIntent(Object srvOrganIntent) {
+        this.srvOrganIntent = srvOrganIntent;
+    }
+
+    public Object getOperName() {
+        return operName;
+    }
+
+    public void setOperName(Object operName) {
+        this.operName = operName;
+    }
+
+    public Object getOperCertiCode() {
+        return operCertiCode;
+    }
+
+    public void setOperCertiCode(Object operCertiCode) {
+        this.operCertiCode = operCertiCode;
+    }
+
+    public Object getOperTel() {
+        return operTel;
+    }
+
+    public void setOperTel(Object operTel) {
+        this.operTel = operTel;
+    }
+
+    public Object getOperRelation() {
+        return operRelation;
+    }
+
+    public void setOperRelation(Object operRelation) {
+        this.operRelation = operRelation;
+    }
+
+    public Object getOperDistrictCode() {
+        return operDistrictCode;
+    }
+
+    public void setOperDistrictCode(Object operDistrictCode) {
+        this.operDistrictCode = operDistrictCode;
+    }
+
+    public Object getOperAddress() {
+        return operAddress;
+    }
+
+    public void setOperAddress(Object operAddress) {
+        this.operAddress = operAddress;
+    }
+
+    public Object getAprConfY() {
+        return aprConfY;
+    }
+
+    public void setAprConfY(Object aprConfY) {
+        this.aprConfY = aprConfY;
+    }
+
+    public Object getApplyStatus() {
+        return applyStatus;
+    }
+
+    public void setApplyStatus(Object applyStatus) {
+        this.applyStatus = applyStatus;
+    }
+
+    public Object getCheckName() {
+        return checkName;
+    }
+
+    public void setCheckName(Object checkName) {
+        this.checkName = checkName;
+    }
+
+    public Object getCheckRemark() {
+        return checkRemark;
+    }
+
+    public void setCheckRemark(Object checkRemark) {
+        this.checkRemark = checkRemark;
+    }
+
+    public Object getCheckTime() {
+        return checkTime;
+    }
+
+    public void setCheckTime(Object checkTime) {
+        this.checkTime = checkTime;
+    }
+
+    public Object getReason() {
+        return reason;
+    }
+
+    public void setReason(Object reason) {
+        this.reason = reason;
+    }
+
+    public Object getDefineEmg() {
+        return defineEmg;
+    }
+
+    public void setDefineEmg(Object defineEmg) {
+        this.defineEmg = defineEmg;
+    }
+
+    public Object getEffTime() {
+        return effTime;
+    }
+
+    public void setEffTime(Object effTime) {
+        this.effTime = effTime;
+    }
+
+    public Object getEndEmg() {
+        return endEmg;
+    }
+
+    public void setEndEmg(Object endEmg) {
+        this.endEmg = endEmg;
+    }
+
+    public Object getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Object endTime) {
+        this.endTime = endTime;
+    }
+
+    public Object getFcd() {
+        return fcd;
+    }
+
+    public void setFcd(Object fcd) {
+        this.fcd = fcd;
+    }
+
+    public Object getFcu() {
+        return fcu;
+    }
+
+    public void setFcu(Object fcu) {
+        this.fcu = fcu;
+    }
+
+    public Object getLcd() {
+        return lcd;
+    }
+
+    public void setLcd(Object lcd) {
+        this.lcd = lcd;
+    }
+
+    public Object getLcu() {
+        return lcu;
+    }
+
+    public void setLcu(Object lcu) {
+        this.lcu = lcu;
+    }
+
+    public Object getAplOrganId() {
+        return aplOrganId;
+    }
+
+    public void setAplOrganId(Object aplOrganId) {
+        this.aplOrganId = aplOrganId;
+    }
+
+    public Object getAdressDistrictProvincial() {
+        return adressDistrictProvincial;
+    }
+
+    public void setAdressDistrictProvincial(Object adressDistrictProvincial) {
+        this.adressDistrictProvincial = adressDistrictProvincial;
+    }
+
+    public Object getAdressDistrictCity() {
+        return adressDistrictCity;
+    }
+
+    public void setAdressDistrictCity(Object adressDistrictCity) {
+        this.adressDistrictCity = adressDistrictCity;
+    }
+
+    public Object getOperDistrictProvincial() {
+        return operDistrictProvincial;
+    }
+
+    public void setOperDistrictProvincial(Object operDistrictProvincial) {
+        this.operDistrictProvincial = operDistrictProvincial;
+    }
+
+    public Object getOperDistrictCity() {
+        return operDistrictCity;
+    }
+
+    public void setOperDistrictCity(Object operDistrictCity) {
+        this.operDistrictCity = operDistrictCity;
+    }
+
+    public Object getLastTaskId() {
+        return lastTaskId;
+    }
+
+    public void setLastTaskId(Object lastTaskId) {
+        this.lastTaskId = lastTaskId;
+    }
+
+    public Object getHisFcd() {
+        return hisFcd;
+    }
+
+    public void setHisFcd(Object hisFcd) {
+        this.hisFcd = hisFcd;
+    }
+
+    public Object getHisFcu() {
+        return hisFcu;
+    }
+
+    public void setHisFcu(Object hisFcu) {
+        this.hisFcu = hisFcu;
+    }
+
+    public Object getHisLcd() {
+        return hisLcd;
+    }
+
+    public void setHisLcd(Object hisLcd) {
+        this.hisLcd = hisLcd;
+    }
+
+    public Object getHisLcu() {
+        return hisLcu;
+    }
+
+    public void setHisLcu(Object hisLcu) {
+        this.hisLcu = hisLcu;
+    }
+
+    public Object getStreet() {
+        return street;
+    }
+
+    public void setStreet(Object street) {
+        this.street = street;
+    }
+
+    public Object getAprTotalScore() {
+        return aprTotalScore;
+    }
+
+    public void setAprTotalScore(Object aprTotalScore) {
+        this.aprTotalScore = aprTotalScore;
+    }
+
+    public Object getApplyId() {
+        return applyId;
+    }
+
+    public void setApplyId(Object applyId) {
+        this.applyId = applyId;
+    }
+
+    public Object getCfgModeId() {
+        return cfgModeId;
+    }
+
+    public void setCfgModeId(Object cfgModeId) {
+        this.cfgModeId = cfgModeId;
+    }
+
+    public Object getAcptProvincial() {
+        return acptProvincial;
+    }
+
+    public void setAcptProvincial(Object acptProvincial) {
+        this.acptProvincial = acptProvincial;
+    }
+
+    public Object getAcptCity() {
+        return acptCity;
+    }
+
+    public void setAcptCity(Object acptCity) {
+        this.acptCity = acptCity;
+    }
+
+    public Object getAcptArea() {
+        return acptArea;
+    }
+
+    public void setAcptArea(Object acptArea) {
+        this.acptArea = acptArea;
+    }
+
+    public Object getAcptStreet() {
+        return acptStreet;
+    }
+
+    public void setAcptStreet(Object acptStreet) {
+        this.acptStreet = acptStreet;
+    }
+
+    public Object getAcptAddress() {
+        return acptAddress;
+    }
+
+    public void setAcptAddress(Object acptAddress) {
+        this.acptAddress = acptAddress;
+    }
+
+    public Object getAcptType() {
+        return acptType;
+    }
+
+    public void setAcptType(Object acptType) {
+        this.acptType = acptType;
+    }
+
+    public Object getDiseTypeF() {
+        return diseTypeF;
+    }
+
+    public void setDiseTypeF(Object diseTypeF) {
+        this.diseTypeF = diseTypeF;
+    }
+
+    public Object getDiseTypeS() {
+        return diseTypeS;
+    }
+
+    public void setDiseTypeS(Object diseTypeS) {
+        this.diseTypeS = diseTypeS;
+    }
+
+    public Object getHisTime() {
+        return hisTime;
+    }
+
+    public void setHisTime(Object hisTime) {
+        this.hisTime = hisTime;
+    }
+
+    public Object getHisEmp() {
+        return hisEmp;
+    }
+
+    public void setHisEmp(Object hisEmp) {
+        this.hisEmp = hisEmp;
+    }
+
+    public Object getAddressLongitude() {
+        return addressLongitude;
+    }
+
+    public void setAddressLongitude(Object addressLongitude) {
+        this.addressLongitude = addressLongitude;
+    }
+
+    public Object getAddressLatitude() {
+        return addressLatitude;
+    }
+
+    public void setAddressLatitude(Object addressLatitude) {
+        this.addressLatitude = addressLatitude;
+    }
+
+    public Object getAcptLongitude() {
+        return acptLongitude;
+    }
+
+    public void setAcptLongitude(Object acptLongitude) {
+        this.acptLongitude = acptLongitude;
+    }
+
+    public Object getAcptLatitude() {
+        return acptLatitude;
+    }
+
+    public void setAcptLatitude(Object acptLatitude) {
+        this.acptLatitude = acptLatitude;
+    }
+
+    public Object getOperStreet() {
+        return operStreet;
+    }
+
+    public void setOperStreet(Object operStreet) {
+        this.operStreet = operStreet;
+    }
+
+    public Object getAgentLongitude() {
+        return agentLongitude;
+    }
+
+    public void setAgentLongitude(Object agentLongitude) {
+        this.agentLongitude = agentLongitude;
+    }
+
+    public Object getAgentLatitude() {
+        return agentLatitude;
+    }
+
+    public void setAgentLatitude(Object agentLatitude) {
+        this.agentLatitude = agentLatitude;
+    }
+
+    public Object getAddressRoadDetail() {
+        return addressRoadDetail;
+    }
+
+    public void setAddressRoadDetail(Object addressRoadDetail) {
+        this.addressRoadDetail = addressRoadDetail;
+    }
+
+    public Object getAddressRoadType() {
+        return addressRoadType;
+    }
+
+    public void setAddressRoadType(Object addressRoadType) {
+        this.addressRoadType = addressRoadType;
+    }
+
+    public Object getAddressNumberDetail() {
+        return addressNumberDetail;
+    }
+
+    public void setAddressNumberDetail(Object addressNumberDetail) {
+        this.addressNumberDetail = addressNumberDetail;
+    }
+
+    public Object getAddressNumberType() {
+        return addressNumberType;
+    }
+
+    public void setAddressNumberType(Object addressNumberType) {
+        this.addressNumberType = addressNumberType;
+    }
+
+    public Object getAcptRoadDetail() {
+        return acptRoadDetail;
+    }
+
+    public void setAcptRoadDetail(Object acptRoadDetail) {
+        this.acptRoadDetail = acptRoadDetail;
+    }
+
+    public Object getAcptRoadType() {
+        return acptRoadType;
+    }
+
+    public void setAcptRoadType(Object acptRoadType) {
+        this.acptRoadType = acptRoadType;
+    }
+
+    public Object getAcptNumberDetail() {
+        return acptNumberDetail;
+    }
+
+    public void setAcptNumberDetail(Object acptNumberDetail) {
+        this.acptNumberDetail = acptNumberDetail;
+    }
+
+    public Object getAcptNumberType() {
+        return acptNumberType;
+    }
+
+    public void setAcptNumberType(Object acptNumberType) {
+        this.acptNumberType = acptNumberType;
+    }
+
+    public Object getOperRoadDetail() {
+        return operRoadDetail;
+    }
+
+    public void setOperRoadDetail(Object operRoadDetail) {
+        this.operRoadDetail = operRoadDetail;
+    }
+
+    public Object getOperRoadType() {
+        return operRoadType;
+    }
+
+    public void setOperRoadType(Object operRoadType) {
+        this.operRoadType = operRoadType;
+    }
+
+    public Object getOperNumberDetail() {
+        return operNumberDetail;
+    }
+
+    public void setOperNumberDetail(Object operNumberDetail) {
+        this.operNumberDetail = operNumberDetail;
+    }
+
+    public Object getOperNumberType() {
+        return operNumberType;
+    }
+
+    public void setOperNumberType(Object operNumberType) {
+        this.operNumberType = operNumberType;
+    }
+
+    public Object getAcptSrvProvincial() {
+        return acptSrvProvincial;
+    }
+
+    public void setAcptSrvProvincial(Object acptSrvProvincial) {
+        this.acptSrvProvincial = acptSrvProvincial;
+    }
+
+    public Object getAcptSrvCity() {
+        return acptSrvCity;
+    }
+
+    public void setAcptSrvCity(Object acptSrvCity) {
+        this.acptSrvCity = acptSrvCity;
+    }
+
+    public Object getAcptSrvArea() {
+        return acptSrvArea;
+    }
+
+    public void setAcptSrvArea(Object acptSrvArea) {
+        this.acptSrvArea = acptSrvArea;
+    }
+
+    public Object getAcptSrvStreet() {
+        return acptSrvStreet;
+    }
+
+    public void setAcptSrvStreet(Object acptSrvStreet) {
+        this.acptSrvStreet = acptSrvStreet;
+    }
+
+    public Object getAcptSrvRoadDetail() {
+        return acptSrvRoadDetail;
+    }
+
+    public void setAcptSrvRoadDetail(Object acptSrvRoadDetail) {
+        this.acptSrvRoadDetail = acptSrvRoadDetail;
+    }
+
+    public Object getAcptSrvRoadType() {
+        return acptSrvRoadType;
+    }
+
+    public void setAcptSrvRoadType(Object acptSrvRoadType) {
+        this.acptSrvRoadType = acptSrvRoadType;
+    }
+
+    public Object getAcptSrvNumberDetail() {
+        return acptSrvNumberDetail;
+    }
+
+    public void setAcptSrvNumberDetail(Object acptSrvNumberDetail) {
+        this.acptSrvNumberDetail = acptSrvNumberDetail;
+    }
+
+    public Object getAcptSrvNumberType() {
+        return acptSrvNumberType;
+    }
+
+    public void setAcptSrvNumberType(Object acptSrvNumberType) {
+        this.acptSrvNumberType = acptSrvNumberType;
+    }
+
+    public Object getAcptSrvAddress() {
+        return acptSrvAddress;
+    }
+
+    public void setAcptSrvAddress(Object acptSrvAddress) {
+        this.acptSrvAddress = acptSrvAddress;
+    }
+
+    public Object getAcptSrvType() {
+        return acptSrvType;
+    }
+
+    public void setAcptSrvType(Object acptSrvType) {
+        this.acptSrvType = acptSrvType;
+    }
+
+    public Object getAcptSrvLongitude() {
+        return acptSrvLongitude;
+    }
+
+    public void setAcptSrvLongitude(Object acptSrvLongitude) {
+        this.acptSrvLongitude = acptSrvLongitude;
+    }
+
+    public Object getAcptSrvLatitude() {
+        return acptSrvLatitude;
+    }
+
+    public void setAcptSrvLatitude(Object acptSrvLatitude) {
+        this.acptSrvLatitude = acptSrvLatitude;
+    }
+
+    public Object getDataFrom() {
+        return dataFrom;
+    }
+
+    public void setDataFrom(Object dataFrom) {
+        this.dataFrom = dataFrom;
+    }
+
+    public Object getFixedTel() {
+        return fixedTel;
+    }
+
+    public void setFixedTel(Object fixedTel) {
+        this.fixedTel = fixedTel;
+    }
+
+    public Object getOperFixedTel() {
+        return operFixedTel;
+    }
+
+    public void setOperFixedTel(Object operFixedTel) {
+        this.operFixedTel = operFixedTel;
+    }
+
+    public Object getRegistProvincial() {
+        return registProvincial;
+    }
+
+    public void setRegistProvincial(Object registProvincial) {
+        this.registProvincial = registProvincial;
+    }
+
+    public Object getRegistCity() {
+        return registCity;
+    }
+
+    public void setRegistCity(Object registCity) {
+        this.registCity = registCity;
+    }
+
+    public Object getRegistArea() {
+        return registArea;
+    }
+
+    public void setRegistArea(Object registArea) {
+        this.registArea = registArea;
+    }
+
+    public Object getRegistStreet() {
+        return registStreet;
+    }
+
+    public void setRegistStreet(Object registStreet) {
+        this.registStreet = registStreet;
+    }
+
+    public Object getRegistAddress() {
+        return registAddress;
+    }
+
+    public void setRegistAddress(Object registAddress) {
+        this.registAddress = registAddress;
+    }
+
+    public Object getRegistLongitude() {
+        return registLongitude;
+    }
+
+    public void setRegistLongitude(Object registLongitude) {
+        this.registLongitude = registLongitude;
+    }
+
+    public Object getRegistLatitude() {
+        return registLatitude;
+    }
+
+    public void setRegistLatitude(Object registLatitude) {
+        this.registLatitude = registLatitude;
+    }
+
+    public Object getMedicalHistory1() {
+        return medicalHistory1;
+    }
+
+    public void setMedicalHistory1(Object medicalHistory1) {
+        this.medicalHistory1 = medicalHistory1;
+    }
+
+    public Object getMedicalHistory2() {
+        return medicalHistory2;
+    }
+
+    public void setMedicalHistory2(Object medicalHistory2) {
+        this.medicalHistory2 = medicalHistory2;
+    }
+
+    public Object getMedicalHistory3() {
+        return medicalHistory3;
+    }
+
+    public void setMedicalHistory3(Object medicalHistory3) {
+        this.medicalHistory3 = medicalHistory3;
+    }
+
+    public Object getHeight() {
+        return height;
+    }
+
+    public void setHeight(Object height) {
+        this.height = height;
+    }
+
+    public Object getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Object weight) {
+        this.weight = weight;
+    }
+
+    public Object getLeftHandGrip() {
+        return leftHandGrip;
+    }
+
+    public void setLeftHandGrip(Object leftHandGrip) {
+        this.leftHandGrip = leftHandGrip;
+    }
+
+    public Object getRightHandGrip() {
+        return rightHandGrip;
+    }
+
+    public void setRightHandGrip(Object rightHandGrip) {
+        this.rightHandGrip = rightHandGrip;
+    }
+
+    public Object getBodyIncomplete() {
+        return bodyIncomplete;
+    }
+
+    public void setBodyIncomplete(Object bodyIncomplete) {
+        this.bodyIncomplete = bodyIncomplete;
+    }
+
+    public Object getVisionObstacle() {
+        return visionObstacle;
+    }
+
+    public void setVisionObstacle(Object visionObstacle) {
+        this.visionObstacle = visionObstacle;
+    }
+
+    public Object getHearingObstacle() {
+        return hearingObstacle;
+    }
+
+    public void setHearingObstacle(Object hearingObstacle) {
+        this.hearingObstacle = hearingObstacle;
+    }
+
+    public Object getMedicalHistory() {
+        return medicalHistory;
+    }
+
+    public void setMedicalHistory(Object medicalHistory) {
+        this.medicalHistory = medicalHistory;
+    }
+
+    public Object getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(Object doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    public Object getDoctorNumber() {
+        return doctorNumber;
+    }
+
+    public void setDoctorNumber(Object doctorNumber) {
+        this.doctorNumber = doctorNumber;
+    }
+
+    public Object getCrossDistrict() {
+        return crossDistrict;
+    }
+
+    public void setCrossDistrict(Object crossDistrict) {
+        this.crossDistrict = crossDistrict;
+    }
+
+    public Object getTreatmentType() {
+        return treatmentType;
+    }
+
+    public void setTreatmentType(Object treatmentType) {
+        this.treatmentType = treatmentType;
+    }
+
+}
\ 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;
     /**
      * 评定人员
      */