Skip to content

L
long-tern-care-service
Commit f537184a authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

失能申请审核详情列表及首次申请新增页

parent df9910ab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 422 additions and 34 deletions
apply/apply-service/src/main/java/com/hungraim/ism/controller/DisableController.java
View file @ f537184a
package com.hungraim.ism.controller; package com.hungraim.ism.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO; import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ism.service.DisableService; import com.hungraim.ism.service.DisableService;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import com.hungraim.ltc.util.Result; import com.hungraim.ltc.util.Result;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -17,7 +20,7 @@ import java.util.List; ...@@ -17,7 +20,7 @@ import java.util.List;
* @author czz * @author czz
*/ */
@RestController @RestController
@RequestMapping("/disable") @RequestMapping("/api.apply/disable")
@Slf4j @Slf4j
public class DisableController { public class DisableController {
...@@ -49,4 +52,85 @@ public class DisableController { ...@@ -49,4 +52,85 @@ public class DisableController {
return Result.success(iPage.getRecords()); return Result.success(iPage.getRecords());
} }
/**
* 失能审核信息详情
*
* @param applyId 申请id
* @return 失能审核信息详情
*/
@RequestMapping("/disableExamineInfo")
public Result<DisableExamineInfoVO> disableExamineInfo(String applyId) {
DisableExamineInfoVO disableExamineInfoVO = disableService.disableExamineInfo(applyId);
return Result.success(disableExamineInfoVO);
}
/**
* 失能审核
*
* @param applyId 申请id
* @param checkName 审核人
* @param applyStatus 审核结果
* @param checkRemark 审核备注
* @return 失能审核信息详情
*/
@RequestMapping("/disableExamine")
public Result disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
disableService.disableExamine(applyId, checkName, applyStatus, checkRemark);
return Result.success();
}
/**
* 新增失能申请
*/
@RequestMapping("/addDisable")
public Result addDisable(ChDisableApply chDisableApply) {
//字段校验
String msg = "";
//所在省市区
if (StringUtils.isBlank(chDisableApply.getDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getDistrictCity()) || StringUtils.isBlank(chDisableApply.getDistrictArea())) {
msg = "所在省市不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getRealName())) {
msg = "申请人姓名不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getCertiCode())) {
msg = "身份证号码不能为空!";
}
if (chDisableApply.getBirthday() == null) {
msg = "出生年月日不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getGender())) {
msg = "性别不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getTel())) {
msg = "手机号不能为空!";
}
if (chDisableApply.getRegist() == null) {
msg = "所在户籍不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getAcptProvincial()) || StringUtils.isBlank(chDisableApply.getAcptCity()) || StringUtils.isBlank(chDisableApply.getAcptArea()) || StringUtils.isBlank(chDisableApply.getAcptStreet()) || StringUtils.isBlank(chDisableApply.getAcptAddress())) {
msg = "接受评定地址不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getAcptSrvProvincial()) || StringUtils.isBlank(chDisableApply.getAcptSrvCity()) || StringUtils.isBlank(chDisableApply.getAcptSrvArea()) || StringUtils.isBlank(chDisableApply.getAcptSrvStreet()) || StringUtils.isBlank(chDisableApply.getAcptSrvAddress())) {
msg = "接受服务地址不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getAdressDistrictProvincial()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCity()) || StringUtils.isBlank(chDisableApply.getAdressDistrictCode()) || StringUtils.isBlank(chDisableApply.getAddressRoadDetail()) || StringUtils.isBlank(chDisableApply.getAddressNumberDetail())) {
msg = "现住址不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getDisease())) {
msg = "诊断疾病不能为空!";
}
if (chDisableApply.getSrvModeId() == null) {
msg = "申请服务方式不能为空!";
}
if (StringUtils.isBlank(chDisableApply.getDiseaseDesc())) {
msg = "疾病描述及诊断不能为空!";
}
if (chDisableApply.getMedicalType() == null) {
msg = "医保类型不能为空!";
}
disableService.addDisable(chDisableApply);
return Result.success();
}
} }
apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyHisMapper.java → apply/apply-service/src/main/java/com/hungraim/ism/dao/DisableApplyMapper.java
View file @ f537184a
...@@ -2,12 +2,15 @@ package com.hungraim.ism.dao; ...@@ -2,12 +2,15 @@ package com.hungraim.ism.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.pojo.vo.disable.ApplicationManagementInfoVO; import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO; import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApplyHis; import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List;
/** /**
* 失能人员申请历史Mapper * 失能人员申请历史Mapper
* *
...@@ -15,7 +18,7 @@ import org.springframework.stereotype.Repository; ...@@ -15,7 +18,7 @@ import org.springframework.stereotype.Repository;
*/ */
@Mapper @Mapper
@Repository @Repository
public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> { public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
/** /**
* 查询待遇申请管理列表 * 查询待遇申请管理列表
* *
...@@ -32,5 +35,8 @@ public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> { ...@@ -32,5 +35,8 @@ public interface DisableApplyHisMapper extends BaseMapper<ChDisableApplyHis> {
String city, String area, String name, String certiCode, String city, String area, String name, String certiCode,
String dataFrom, String srvOrganId); String dataFrom, String srvOrganId);
ApplicationManagementInfoVO selectApplicationManagementInfoById(String id);
DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyHisId);
List<ExamineRecord> listExamineRecordByApplyId(String applyHisId);
} }
apply/apply-service/src/main/java/com/hungraim/ism/service/DisableService.java
View file @ f537184a
package com.hungraim.ism.service; package com.hungraim.ism.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO; import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -31,4 +33,15 @@ public interface DisableService { ...@@ -31,4 +33,15 @@ public interface DisableService {
String districtArea, String realName, String certiCode, String dataFrom, String districtArea, String realName, String certiCode, String dataFrom,
String srvOrganId, int pageNum, int pageSize); String srvOrganId, int pageNum, int pageSize);
/**
* 失能审核信息详情
*
* @param applyId 申请id
* @return 失能审核信息详情
*/
DisableExamineInfoVO disableExamineInfo(String applyId);
void addDisable(ChDisableApply chDisableApply);
void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark);
} }
apply/apply-service/src/main/java/com/hungraim/ism/service/impl/DisableServiceImpl.java
View file @ f537184a
package com.hungraim.ism.service.impl; package com.hungraim.ism.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.dao.DisableApplyHisMapper; import com.hungraim.ism.dao.DisableApplyMapper;
import com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO; import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ism.pojo.vo.disable.ExamineRecord;
import com.hungraim.ism.service.DisableService; import com.hungraim.ism.service.DisableService;
import com.hungraim.ltc.pojo.entity.disable.ChDisableApply;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
@Service @Service
public class DisableServiceImpl implements DisableService { public class DisableServiceImpl implements DisableService {
@Autowired @Autowired
private DisableApplyHisMapper disableApplyHisMapper; private DisableApplyMapper disableApplyMapper;
@Override @Override
public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity, public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
String districtArea, String realName, String certiCode, String dataFrom, String districtArea, String realName, String certiCode, String dataFrom,
String srvOrganId, int page, int pageSize) { String srvOrganId, int page, int pageSize) {
return disableApplyHisMapper.disableList(new Page(page, pageSize), organId, districtProvincial, return disableApplyMapper.disableList(new Page(page, pageSize), organId, districtProvincial,
districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId); districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId);
} }
@Override
public DisableExamineInfoVO disableExamineInfo(String applyId) {
DisableExamineInfoVO disableExamineInfoVO = disableApplyMapper.selectDisableExamineInfoByApplyId(applyId);
List<ExamineRecord> examineRecords = disableApplyMapper.listExamineRecordByApplyId(applyId);
disableExamineInfoVO.setExamineRecords(examineRecords);
return disableExamineInfoVO;
}
@Override
public void addDisable(ChDisableApply chDisableApply) {
disableApplyMapper.insert(chDisableApply);
}
@Override
public void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
ChDisableApply chDisableApply = disableApplyMapper.selectById(applyId);
chDisableApply.setCheckName(checkName);
chDisableApply.setApplyStatus(applyStatus);
chDisableApply.setCheckRemark(checkRemark);
}
} }
\ No newline at end of file
apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml 0 → 100644
View file @ f537184a
<?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.ism.dao.DisableApplyMapper">
<select id="disableList" resultType="com.hungraim.ism.pojo.vo.disable.DisableVO">
select a.APPLY_ID applyId,
o.SRV_ORGAN_NAME organName,
a.organ_id organId,
a.DISTRICT_PROVINCIAL provincial,
a.DISTRICT_CITY city,
a.DISTRICT_AREA area,
a.REAL_NAME name,
a.CERTI_CODE certiCode,
a.TREATMENT_TYPE treatmentTyte,
a.OPER_NAME operName,
a.gender gender,
a.OPER_CERTI_CODE operCertiCode,
a.fixed_tel fixedTel,
a.srv_mode_id srvModeId,
a.disease disease,
a.eff_time effTime,
a.data_from dataFrom,
a.ADRESS_DETAIL adressDetail
from CH_DISABLE_APPLY a,CH_SRV_ORGAN o
where a.organ_id = o.ORGAN_ID
<if test="provincial != null and city != null and area != null">
and a.organ_id = #{organId}
</if>
<if test="provincial != null and city != null and area != null">
and a.DISTRICT_PROVINCIAL = #{provincial}
and a.DISTRICT_CITY = #{city}
and a.DISTRICT_AREA = #{area}
</if>
<if test="name != null">
and a.REAL_NAME like '%'#{name}'%'
</if>
<if test="certiCode != null">
and h.CERTI_CODE = #{certiCode}
</if>
<if test="dataFrom != null">
and h.DATA_FROM = #{dataFrom}
</if>
<if test="srvOrganId != null">
and h.srvOrganId = #{srvOrganId}
</if>
</select>
<select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.DisableExamineInfoVO">
select a.organ_id organId,
(select o1.organ_name from CH_SRV_ORGAN o1 where a.organ_id = o1.organ_code) organName,
a.DISTRICT_PROVINCIAL provincial,
a.DISTRICT_CITY city,
a.DISTRICT_AREA area,
a.REAL_NAME name,
a.CERTI_CODE certiCode,
a.BIRTHDAY birthday,
a.GENDER gender,
a.TEL tel,
a.REGIST regist,
a.FIXED_TEL fixedTel,
a.TREATMENT_TYPE treatmentType,
a.ACPT_PROVINCIAL acptProvincial,
a.ACPT_CITY acptCity,
a.ACPT_AREA acptArea,
a.ACPT_STREET acptStreet,
a.ACPT_ADDRESS acptAddress,
a.ACPT_SRV_PROVINCIAL acptSrvProvincial,
a.ACPT_SRV_CITY acptSrvCity,
a.ACPT_SRV_AREA acptSrvArea,
a.ACPT_SRV_STREET acptSrvStreet,
a.ACPT_SRV_ROAD_DETAIL acptSrvRoadDetail,
a.ADRESS_DISTRICT_PROVINCIAL adressDistrictProvincial,
a.ADRESS_DISTRICT_CITY adressDistrictCity,
a.ADRESS_DISTRICT_CODE adressDistrictCode,
a.ADDRESS_ROAD_DETAIL addressRoadDetail,
a.ADDRESS_NUMBER_DETAIL addressNumberDetail,
a.DISEASE disease,
a.APPLY_METHOD applyMethod,
a.DISEASE_DESC diseaseDesc,
a.MEDICAL_CARD medicalCard,
a.MEDICAL_TYPE medicalType,
a.SRV_ORGAN_ID srvOrganId,
o.PERMIT_ID permitId,
a.OPER_NAME operName,
a.OPER_CERTI_CODE operCertiCode,
a.OPER_TEL operTel,
a.OPER_RELATION operRelation,
a.OPER_FIXED_TEL operFixedTel,
a.OPER_DISTRICT_PROVINCE operDistrictProvince,
a.OPER_DISTRICT_CITY operDistrictCity,
a.OPER_DISTRICT_CODE operDistrictCode,
a.OPER_STREET operStreet,
a.OPER_ADDRESS operAddress,
a.CHECK_NAME checkName,
a.APPLY_STATUS applyStatus,
a.CHECK_REMARK checkRemark
from CH_DISABLE_APPLY a,
CH_SRV_ORGAN o
where a.APPLY_ID = #{applyHisId}
and a.SRV_ORGAN_ID = o.organ_code
</select>
<select id="listExamineRecordByApplyId" resultType="com.hungraim.ism.pojo.vo.disable.ExamineRecord">
select CHECK_TIME checkTime,
TREATMENT_TYPE city,
APPLY_STATUS status,
CHECK_NAME name,
CHECK_REMARK certiCode
from CH_DISABLE_APPLY_HIS
where APPLY_ID = #{applyHisId}
</select>
</mapper>
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/ApplicationManagementInfoVO.java deleted 100644 → 0
View file @ df9910ab
package com.hungraim.ism.pojo.vo.disable;
/**
* 待遇申请管理详情VO
*/
public class ApplicationManagementInfoVO {
//所在省市区
//参保人姓名
//参保人身份证号码
//居住地址
//联系人电话
//联系人身份证号码
//申请人电话
//与参保人关系
//病情描述及诊断
//意向服务机构
//提交时间
//审核人
//审核结果
//备注
}
common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableExamineInfoVO.java 0 → 100644
View file @ f537184a
package com.hungraim.ism.pojo.vo.disable;
import java.util.Date;
import java.util.List;
/**
* 失能审核信息详情VO
*/
public class DisableExamineInfoVO {
//***失能人员个人信息
//机构
private String organId;
private String organName;
//所在省市
private String provincial;
private String city;
private String area;
//申请人签名
private String name;
//身份证号码
private String certiCode;
//出生年月日
private Date birthday;
//性别
private String gender;
//手机
private String tel;
//所在户籍
private String regist;
//固话
private String fixedTel;
//待遇类型
private String treatmentType;
//接受评定地址
private String acptProvincial;
private String acptCity;
private String acptArea;
private String acptStreet;
private String acptAddress;
//接受服务地址
private String acptSrvProvincial;
private String acptSrvCity;
private String acptSrvArea;
private String acptSrvStreet;
private String acptSrvRoadDetail;
//现住址
private String adressDistrictProvincial;
private String adressDistrictCity;
private String adressDistrictCode;
private String addressRoadDetail;
private String addressNumberDetail;
//***失能人员医疗及失能信息
//诊断疾病
private String disease;
//申请服务方式
private String applyMethod;
//病情描述及诊断
private String diseaseDesc;
//社会保障卡号
private String medicalCard;
//医保类型
private String medicalType;
//意向服务机构
private String srvOrganId;
//意向服务机构执业许可证登记号
private String permitId;
//***代办人信息
//姓名
private String operName;
//身份证号码
private String operCertiCode;
//手机
private String operTel;
//与失能人员关系
private String operRelation;
//代办人固话
private String operFixedTel;
//现住址
private String operDistrictProvince;
private String operDistrictCity;
private String operDistrictCode;
private String operStreet;
private String operAddress;
//***审核记录
private List<ExamineRecord> examineRecords;
//***审核结果
//审核人
private String checkName;
//审核结果
private String applyStatus;
//备注
private String checkRemark;
public List<ExamineRecord> getExamineRecords() {
return examineRecords;
}
public void setExamineRecords(List<ExamineRecord> examineRecords) {
this.examineRecords = examineRecords;
}
}
common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/DisableVO.java
View file @ f537184a
...@@ -5,7 +5,7 @@ package com.hungraim.ism.pojo.vo.disable; ...@@ -5,7 +5,7 @@ package com.hungraim.ism.pojo.vo.disable;
*/ */
public class DisableVO { public class DisableVO {
//id //id
private String applyHisId; private String applyId;
//适用机构 //适用机构
private String organName; private String organName;
//机构代码 //机构代码
...@@ -40,12 +40,12 @@ public class DisableVO { ...@@ -40,12 +40,12 @@ public class DisableVO {
//审核状态 //审核状态
private String adressDetail; private String adressDetail;
public String getApplyHisId() { public String getApplyId() {
return applyHisId; return applyId;
} }
public void setApplyHisId(String applyHisId) { public void setApplyId(String applyId) {
this.applyHisId = applyHisId; this.applyId = applyId;
} }
public String getOrganName() { public String getOrganName() {
......
common/common-core/src/main/java/com/hungraim/ism/pojo/vo/disable/ExamineRecord.java 0 → 100644
View file @ f537184a
package com.hungraim.ism.pojo.vo.disable;
import java.util.Date;
public class ExamineRecord {
//审核时间
private Date checkTime;
//申请类型
private String city;
//审核结果
private String status;
//审核人
private String name;
//备注
private String certiCode;
public Date getCheckTime() {
return checkTime;
}
public void setCheckTime(Date checkTime) {
this.checkTime = checkTime;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCertiCode() {
return certiCode;
}
public void setCertiCode(String certiCode) {
this.certiCode = certiCode;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment