Commit c7a5e28f authored by zhangch's avatar zhangch

Merge branch 'master' of gitee.com:shanghai_heng_ge_information/long-term-care

parents b4367660 70e2d9a5
...@@ -129,6 +129,9 @@ public class DisableController { ...@@ -129,6 +129,9 @@ public class DisableController {
if (chDisableApply.getMedicalType() == null) { if (chDisableApply.getMedicalType() == null) {
msg = "医保类型不能为空!"; msg = "医保类型不能为空!";
} }
if (!"".equals(msg)) {
return Result.failed(msg);
}
disableService.addDisable(chDisableApply); disableService.addDisable(chDisableApply);
return Result.success(); return Result.success();
} }
......
package com.hungraim.ltc.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
import com.hungraim.ltc.service.DisableEvaluateService;
import com.hungraim.ltc.util.Result;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 失能评定Controller
*
* @author czz
*/
@RestController
@RequestMapping("/api.apply/disableEvaluate")
@Slf4j
public class DisableEvaluateController {
@Autowired
private DisableEvaluateService disableEvaluateService;
/**
* 失能评定列表
*
* @param organId 适用机构代码
* @param srvOrganId 护理机构
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param pageNum 当前页
* @param pageSize 每页几条数据
* @return 失能评定列表
*/
@RequestMapping("/disableEvaluateList")
public Result<List<DisableEvaluateVO>> disableEvaluateList(String organId, String srvOrganId, String realName, String certiCode, int pageNum, int pageSize) {
IPage<DisableEvaluateVO> iPage = disableEvaluateService.disableEvaluateList(organId, realName, certiCode, srvOrganId, pageNum, pageSize);
return Result.success(iPage.getRecords());
}
/**
* 失能评定详情
*
* @param evaluateId 评定id
* @return 失能审核信息详情
*/
@RequestMapping("/disableEvaluateInfo")
public Result<DisableEvaluateInfoVO> disableEvaluateInfo(String evaluateId) {
DisableEvaluateInfoVO disableEvaluateInfoVO = disableEvaluateService.disableEvaluateInfo(evaluateId);
return Result.success(disableEvaluateInfoVO);
}
/**
* 失能评定
*
* @param applyId 申请id
* @param checkName 审核人
* @param applyStatus 审核结果
* @param checkRemark 审核备注
* @return 失能审核信息详情
*/
@RequestMapping("/disableEvaluate")
public Result disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark) {
//disableEvaluateService.disableExamine(applyId, checkName, applyStatus, checkRemark);
return Result.success();
}
/**
* 新增失能申请
*/
@RequestMapping("/addDisableEvaluate")
public Result addEvaluate(ChDisableEvaluate chDisableEvaluate) {
return Result.success();
}
}
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
import com.hungraim.ism.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
/**
* 失能人员申请历史Mapper
*
* @author czz
*/
@Mapper
@Repository
public interface DisableEvaluateMapper extends BaseMapper<ChDisableEvaluate> {
/**
* 查询失能评定列表
*
* @param organId 适用机构代码
* @param srvOrganId 护理机构
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
*/
Page<DisableEvaluateVO> disableEvaluateList(Page<DisableVO> page, String organId, String srvOrganId, String realName, String certiCode);
DisableEvaluateInfoVO selectDisableEvaluateInfoByEvaluateId(String evaluateId);
}
package com.hungraim.ltc.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
import org.springframework.stereotype.Service;
/**
* 失能申请Service
*
* @author czz
*/
@Service
public interface DisableEvaluateService {
/**
* 失能评定列表
*
* @param organId 适用机构代码
* @param srvOrganId 护理机构
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param pageNum 当前页
* @param pageSize 每页几条数据
* @return
*/
IPage<DisableEvaluateVO> disableEvaluateList(String organId, String srvOrganId, String realName, String certiCode, int pageNum, int pageSize);
/**
* 失能评定详情
*
* @param evaluateId 评定id
* @return 失能评定详情
*/
DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId);
void addEvaluate(ChDisableEvaluate disableEvaluate);
void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark);
}
package com.hungraim.ltc.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO;
import com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO;
import com.hungraim.ltc.dao.DisableEvaluateMapper;
import com.hungraim.ltc.pojo.entity.disable.ChDisableEvaluate;
import com.hungraim.ltc.service.DisableEvaluateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class DisableEvaluateServiceImpl implements DisableEvaluateService {
@Autowired
private DisableEvaluateMapper disableEvaluateList;
@Override
public IPage<DisableEvaluateVO> disableEvaluateList(String organId, String srvOrganId, String realName, String certiCode, int pageNum, int pageSize) {
return disableEvaluateList.disableEvaluateList(new Page(pageNum, pageSize), organId, realName, certiCode, srvOrganId);
}
@Override
public DisableEvaluateInfoVO disableEvaluateInfo(String evaluateId) {
return disableEvaluateList.selectDisableEvaluateInfoByEvaluateId(evaluateId);
}
@Override
public void addEvaluate(ChDisableEvaluate disableEvaluate) {
disableEvaluateList.insert(disableEvaluate);
}
@Override
public void disableEvaluate(String applyId, String checkName, Short applyStatus, String checkRemark) {
/*ChDisableApply chDisableApply = disableEvaluateList.selectById(applyId);
chDisableApply.setCheckName(checkName);
chDisableApply.setApplyStatus(applyStatus);
chDisableApply.setCheckRemark(checkRemark);*/
}
}
\ No newline at end of file
...@@ -31,3 +31,4 @@ server: ...@@ -31,3 +31,4 @@ server:
mybatis-plus: mybatis-plus:
configuration: configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
mapper-locations: classpath*:mapper/*Mapper.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.ism.dao.DisableApplyMapper">
<select id="disableEvaluateList" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateVO">
select e.evaluate_id evaluateId,
o.SRV_ORGAN_NAME organName,
e.organ_id organId,
e.PROVINCE_CODE provincial,
e.CITY_CODE city,
e.AREA_CODE area,
e.REAL_NAME realName,
e.CERTI_CODE certiCode,
e.DISEASE_DESC diseaseDesc,
e.TEL tel,
e.SRV_ORGEN_ID srvOrgenId,
e.MODE_ID modeId,
e.EVALUATE_TIME evaluateTime
from CH_DISABLE_EVALUATE e,CH_SRV_ORGAN o
where e.organ_id = o.ORGAN_ID
<if test="organId != null">
and e.organ_Id = #{organId}
</if>
<if test="srvOrganId != null">
and e.srv_Organ_Id = #{srvOrganId}
</if>
<if test="realName != null">
and e.real_Name like '%'#{realName}'%'
</if>
<if test="certiCode != null">
and e.certi_Code = #{certiCode}
</if>
</select>
<select id="selectDisableEvaluateInfoByEvaluateId" resultType="com.hungraim.ism.pojo.vo.disable.DisableEvaluateInfoVO">
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>
</mapper>
\ No newline at end of file
package com.hungraim.ism.pojo.vo.disable;
import java.util.Date;
/**
* 失能审核信息详情VO
*/
public class DisableEvaluateInfoVO {
//***失能人员个人信息
//机构
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 disease;
//申请服务方式
private String applyMethod;
//病情描述及诊断
private String diseaseDesc;
//社会保障卡号
private String medicalCard;
//医保类型
private String medicalType;
//意向服务机构
private String srvOrganId;
//意向服务机构执业许可证登记号
private String permitId;
//***评定人信息
//评定人员1
private String p1;
//评定人员1所属机构
private String p1organ;
//评定人员1身份证号码
private String p1CertiCode;
//评定人员1手机号码
private String p1Tel;
//评定人员2
private String p2;
//评定人员2所属机构
private String p2Organ;
//评定人员2身份证号码
private String p2CertiCode;
//评定人员2手机号码
private String p2Tel;
//评定人员3
private String p3;
//评定人员3所属机构
private String p3Organ;
//评定人员3身份证号码
private String p3CertiCode;
//评定人员3手机号码
private String p3Tel;
//评估时间
private String operTel;
}
package com.hungraim.ism.pojo.vo.disable;
import java.util.Date;
/**
* 失能评定列表VO
*/
public class DisableEvaluateVO {
//id
private String evaluateId;
//适用机构
private String organName;
//机构代码
private String organId;
//所在省市
private String provincial;
private String city;
private String area;
//失能人员姓名
private String realName;
//失能人员身份证号码
private String certiCode;
//年龄
//诊断疾病
private String diseaseDesc;
//失能人员手机号码
private String tel;
//意向服务机构
private String srvOrgenId;
//申请护理方式
private String modeId;
//综合评定时间
private Date evaluateTime;
//评定等级
public String getEvaluateId() {
return evaluateId;
}
public void setEvaluateId(String evaluateId) {
this.evaluateId = evaluateId;
}
public String getOrganName() {
return organName;
}
public void setOrganName(String organName) {
this.organName = organName;
}
public String getOrganId() {
return organId;
}
public void setOrganId(String organId) {
this.organId = organId;
}
public String getProvincial() {
return provincial;
}
public void setProvincial(String provincial) {
this.provincial = provincial;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getCertiCode() {
return certiCode;
}
public void setCertiCode(String certiCode) {
this.certiCode = certiCode;
}
public String getDiseaseDesc() {
return diseaseDesc;
}
public void setDiseaseDesc(String diseaseDesc) {
this.diseaseDesc = diseaseDesc;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getSrvOrgenId() {
return srvOrgenId;
}
public void setSrvOrgenId(String srvOrgenId) {
this.srvOrgenId = srvOrgenId;
}
public String getModeId() {
return modeId;
}
public void setModeId(String modeId) {
this.modeId = modeId;
}
public Date getEvaluateTime() {
return evaluateTime;
}
public void setEvaluateTime(Date evaluateTime) {
this.evaluateTime = evaluateTime;
}
}
...@@ -103,4 +103,387 @@ public class DisableExamineInfoVO { ...@@ -103,4 +103,387 @@ public class DisableExamineInfoVO {
this.examineRecords = examineRecords; this.examineRecords = examineRecords;
} }
public String getOrganId() {
return organId;
}
public void setOrganId(String organId) {
this.organId = organId;
}
public String getOrganName() {
return organName;
}
public void setOrganName(String organName) {
this.organName = organName;
}
public String getProvincial() {
return provincial;
}
public void setProvincial(String provincial) {
this.provincial = provincial;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getArea() {
return area;
}
public void setArea(String area) {
this.area = area;
}
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;
}
public Date getBirthday() {
return birthday;
}
public void setBirthday(Date birthday) {
this.birthday = birthday;
}
public String getGender() {
return gender;
}
public void setGender(String gender) {
this.gender = gender;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getRegist() {
return regist;
}
public void setRegist(String regist) {
this.regist = regist;
}
public String getFixedTel() {
return fixedTel;
}
public void setFixedTel(String fixedTel) {
this.fixedTel = fixedTel;
}
public String getTreatmentType() {
return treatmentType;
}
public void setTreatmentType(String treatmentType) {
this.treatmentType = treatmentType;
}
public String getAcptProvincial() {
return acptProvincial;
}
public void setAcptProvincial(String acptProvincial) {
this.acptProvincial = acptProvincial;
}
public String getAcptCity() {
return acptCity;
}
public void setAcptCity(String acptCity) {
this.acptCity = acptCity;
}
public String getAcptArea() {
return acptArea;
}
public void setAcptArea(String acptArea) {
this.acptArea = acptArea;
}
public String getAcptStreet() {
return acptStreet;
}
public void setAcptStreet(String acptStreet) {
this.acptStreet = acptStreet;
}
public String getAcptAddress() {
return acptAddress;
}
public void setAcptAddress(String acptAddress) {
this.acptAddress = acptAddress;
}
public String getAcptSrvProvincial() {
return acptSrvProvincial;
}
public void setAcptSrvProvincial(String acptSrvProvincial) {
this.acptSrvProvincial = acptSrvProvincial;
}
public String getAcptSrvCity() {
return acptSrvCity;
}
public void setAcptSrvCity(String acptSrvCity) {
this.acptSrvCity = acptSrvCity;
}
public String getAcptSrvArea() {
return acptSrvArea;
}
public void setAcptSrvArea(String acptSrvArea) {
this.acptSrvArea = acptSrvArea;
}
public String getAcptSrvStreet() {
return acptSrvStreet;
}
public void setAcptSrvStreet(String acptSrvStreet) {
this.acptSrvStreet = acptSrvStreet;
}
public String getAcptSrvRoadDetail() {
return acptSrvRoadDetail;
}
public void setAcptSrvRoadDetail(String acptSrvRoadDetail) {
this.acptSrvRoadDetail = acptSrvRoadDetail;
}
public String getAdressDistrictProvincial() {
return adressDistrictProvincial;
}
public void setAdressDistrictProvincial(String adressDistrictProvincial) {
this.adressDistrictProvincial = adressDistrictProvincial;
}
public String getAdressDistrictCity() {
return adressDistrictCity;
}
public void setAdressDistrictCity(String adressDistrictCity) {
this.adressDistrictCity = adressDistrictCity;
}
public String getAdressDistrictCode() {
return adressDistrictCode;
}
public void setAdressDistrictCode(String adressDistrictCode) {
this.adressDistrictCode = adressDistrictCode;
}
public String getAddressRoadDetail() {
return addressRoadDetail;
}
public void setAddressRoadDetail(String addressRoadDetail) {
this.addressRoadDetail = addressRoadDetail;
}
public String getAddressNumberDetail() {
return addressNumberDetail;
}
public void setAddressNumberDetail(String addressNumberDetail) {
this.addressNumberDetail = addressNumberDetail;
}
public String getDisease() {
return disease;
}
public void setDisease(String disease) {
this.disease = disease;
}
public String getApplyMethod() {
return applyMethod;
}
public void setApplyMethod(String applyMethod) {
this.applyMethod = applyMethod;
}
public String getDiseaseDesc() {
return diseaseDesc;
}
public void setDiseaseDesc(String diseaseDesc) {
this.diseaseDesc = diseaseDesc;
}
public String getMedicalCard() {
return medicalCard;
}
public void setMedicalCard(String medicalCard) {
this.medicalCard = medicalCard;
}
public String getMedicalType() {
return medicalType;
}
public void setMedicalType(String medicalType) {
this.medicalType = medicalType;
}
public String getSrvOrganId() {
return srvOrganId;
}
public void setSrvOrganId(String srvOrganId) {
this.srvOrganId = srvOrganId;
}
public String getPermitId() {
return permitId;
}
public void setPermitId(String permitId) {
this.permitId = permitId;
}
public String getOperName() {
return operName;
}
public void setOperName(String operName) {
this.operName = operName;
}
public String getOperCertiCode() {
return operCertiCode;
}
public void setOperCertiCode(String operCertiCode) {
this.operCertiCode = operCertiCode;
}
public String getOperTel() {
return operTel;
}
public void setOperTel(String operTel) {
this.operTel = operTel;
}
public String getOperRelation() {
return operRelation;
}
public void setOperRelation(String operRelation) {
this.operRelation = operRelation;
}
public String getOperFixedTel() {
return operFixedTel;
}
public void setOperFixedTel(String operFixedTel) {
this.operFixedTel = operFixedTel;
}
public String getOperDistrictProvince() {
return operDistrictProvince;
}
public void setOperDistrictProvince(String operDistrictProvince) {
this.operDistrictProvince = operDistrictProvince;
}
public String getOperDistrictCity() {
return operDistrictCity;
}
public void setOperDistrictCity(String operDistrictCity) {
this.operDistrictCity = operDistrictCity;
}
public String getOperDistrictCode() {
return operDistrictCode;
}
public void setOperDistrictCode(String operDistrictCode) {
this.operDistrictCode = operDistrictCode;
}
public String getOperStreet() {
return operStreet;
}
public void setOperStreet(String operStreet) {
this.operStreet = operStreet;
}
public String getOperAddress() {
return operAddress;
}
public void setOperAddress(String operAddress) {
this.operAddress = operAddress;
}
public String getCheckName() {
return checkName;
}
public void setCheckName(String checkName) {
this.checkName = checkName;
}
public String getApplyStatus() {
return applyStatus;
}
public void setApplyStatus(String applyStatus) {
this.applyStatus = applyStatus;
}
public String getCheckRemark() {
return checkRemark;
}
public void setCheckRemark(String checkRemark) {
this.checkRemark = checkRemark;
}
} }
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