Skip to content

L
long-tern-care-service
Commit f888d1fa authored by 何龙龙's avatar 何龙龙
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b07948ac 8a882f15
Hide whitespace changes
Inline Side-by-side
Showing with 1627 additions and 286 deletions
apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java
View file @ f888d1fa
...@@ -2,12 +2,14 @@ package com.hungraim.ltc.controller; ...@@ -2,12 +2,14 @@ package com.hungraim.ltc.controller;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.hungraim.ltc.pojo.entity.disable.*;
import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO; import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ltc.pojo.vo.disable.DisableInfoVO;
import com.hungraim.ltc.pojo.vo.disable.DisableVO; import com.hungraim.ltc.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.vo.disable.DistrictTreeVo; import com.hungraim.ltc.pojo.vo.disable.DistrictTreeVo;
import com.hungraim.ltc.service.DisableService; import com.hungraim.ltc.service.DisableService;
import com.hungraim.ltc.pojo.entity.disable.*;
import com.hungraim.ltc.util.Result; import com.hungraim.ltc.util.Result;
import com.hungraim.ltc.util.ResultCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -99,11 +101,23 @@ public class DisableController { ...@@ -99,11 +101,23 @@ public class DisableController {
*/ */
@RequestMapping("/fndDiseaseList") @RequestMapping("/fndDiseaseList")
public Result<List<ChFndDiseaseType>> fndDiseaseList(String parDiseTypeId) { public Result<List<ChFndDiseaseType>> fndDiseaseList(String parDiseTypeId) {
if (StrUtil.isNotBlank(parDiseTypeId)) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
List<ChFndDiseaseType> chFndDiseaseTypes = disableService.fndDiseaseList(parDiseTypeId); List<ChFndDiseaseType> chFndDiseaseTypes = disableService.fndDiseaseList(parDiseTypeId);
return Result.success(chFndDiseaseTypes); return Result.success(chFndDiseaseTypes);
} }
/** /**
* 查询所有疾病数据
*/
@RequestMapping("/fndAllDisease")
public Result<List<ChFndDiseaseType>> fndAllDisease() {
List<ChFndDiseaseType> chFndDiseaseTypes = disableService.fndAllDisease();
return Result.success(chFndDiseaseTypes);
}
/**
* 查询护理机构下所有子机构id * 查询护理机构下所有子机构id
* *
* @param organId 机构id * @param organId 机构id
...@@ -234,5 +248,18 @@ public class DisableController { ...@@ -234,5 +248,18 @@ public class DisableController {
return Result.success(); return Result.success();
} }
/**
* 查询失能人员信息
*
* @param disableInfoId 失能人员id
*/
@RequestMapping("/getDisableInfo")
public Result getDisableInfo(String disableInfoId) {
if (StringUtils.isBlank(disableInfoId)) {
return Result.failed("请求参数错误");
}
DisableInfoVO disableInfoVO = disableService.getDisableInfo(disableInfoId);
return Result.success(disableInfoVO);
}
} }
apply/apply-service/src/main/java/com/hungraim/ltc/dao/CfgParaMapper.java 0 → 100644
View file @ f888d1fa
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> {
}
apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableApplyMapper.java
View file @ f888d1fa
...@@ -2,10 +2,11 @@ package com.hungraim.ltc.dao; ...@@ -2,10 +2,11 @@ package com.hungraim.ltc.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.ltc.pojo.entity.disable.ChDisableApply;
import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO; import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ltc.pojo.vo.disable.DisableInfoVO;
import com.hungraim.ltc.pojo.vo.disable.DisableVO; import com.hungraim.ltc.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.vo.disable.ExamineRecord; import com.hungraim.ltc.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;
...@@ -39,4 +40,6 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> { ...@@ -39,4 +40,6 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId); DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId);
List<ExamineRecord> listExamineRecordByApplyId(String applyId); List<ExamineRecord> listExamineRecordByApplyId(String applyId);
DisableInfoVO getDisableInfo(String disableInfoId);
} }
apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java
View file @ f888d1fa
package com.hungraim.ltc.service; package com.hungraim.ltc.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.disable.*;
import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO; import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO;
import com.hungraim.ltc.pojo.vo.disable.DisableInfoVO;
import com.hungraim.ltc.pojo.vo.disable.DisableVO; import com.hungraim.ltc.pojo.vo.disable.DisableVO;
import com.hungraim.ltc.pojo.entity.disable.*;
import com.hungraim.ltc.pojo.vo.disable.DistrictTreeVo; import com.hungraim.ltc.pojo.vo.disable.DistrictTreeVo;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -17,24 +18,10 @@ import java.util.List; ...@@ -17,24 +18,10 @@ import java.util.List;
@Service @Service
public interface DisableService { public interface DisableService {
/**
* 查询所有资源对应的角色
*
* @param organId 适用机构代码
* @param districtProvincial 所在省
* @param districtCity 所在市
* @param districtArea 所在区域
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param dataFrom 申请来源
* @param srvOrganId 护理机构
* @param pageNum 当前页
* @param pageSize 每页几条数据
* @return list
*/
Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity, 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 pageNum, int pageSize); String srvOrganName, int pageNum, int pageSize);
/** /**
* 失能审核信息详情 * 失能审核信息详情
...@@ -100,4 +87,11 @@ public interface DisableService { ...@@ -100,4 +87,11 @@ public interface DisableService {
* @return 返回树形结构省市区数据 * @return 返回树形结构省市区数据
*/ */
List<DistrictTreeVo> getAllDistrictTreeData(); List<DistrictTreeVo> getAllDistrictTreeData();
/**
* 查询所有疾病数据
*/
List<ChFndDiseaseType> fndAllDisease();
DisableInfoVO getDisableInfo(String disableInfoId);
} }
apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java
View file @ f888d1fa
...@@ -7,20 +7,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -7,20 +7,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.dao.*; import com.hungraim.ltc.dao.*;
import com.hungraim.ltc.pojo.entity.assessment.ChAprTask; import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
import com.hungraim.ltc.pojo.entity.disable.*; import com.hungraim.ltc.pojo.entity.disable.*;
import com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO; import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
import com.hungraim.ltc.pojo.vo.disable.DisableVO; import com.hungraim.ltc.pojo.vo.disable.*;
import com.hungraim.ltc.pojo.vo.disable.DistrictTreeVo;
import com.hungraim.ltc.pojo.vo.disable.ExamineRecord;
import com.hungraim.ltc.service.DisableService; import com.hungraim.ltc.service.DisableService;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
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.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@Service @Service
public class DisableServiceImpl implements DisableService { public class DisableServiceImpl implements DisableService {
...@@ -45,6 +40,8 @@ public class DisableServiceImpl implements DisableService { ...@@ -45,6 +40,8 @@ public class DisableServiceImpl implements DisableService {
private DisableInfoMapper disableInfoMapper; private DisableInfoMapper disableInfoMapper;
@Autowired @Autowired
private AprTaskMapper aprTaskMapper; private AprTaskMapper aprTaskMapper;
@Autowired
private CfgParaMapper cfgParaMapper;
/** /**
* 获取机构ids * 获取机构ids
...@@ -68,17 +65,31 @@ public class DisableServiceImpl implements DisableService { ...@@ -68,17 +65,31 @@ public class DisableServiceImpl implements DisableService {
} }
} }
/**
* 查询所有资源对应的角色
*
* @param organId 适用机构代码
* @param districtProvincial 所在省
* @param districtCity 所在市
* @param districtArea 所在区域
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param dataFrom 申请来源
* @param srvOrganName 护理机构名称
* @param pageNum 当前页
* @param pageSize 每页几条数据
* @return list
*/
@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 srvOrganName, int page, int pageSize) { String srvOrganName, int pageNum, int pageSize) {
// 没有organId参数的时候，这个集合就为null // 没有organId参数的时候，这个集合就为null
List<String> organIds = null; List<String> organIds = null;
if (StrUtil.isNotBlank(organId)) { if (StrUtil.isNotBlank(organId)) {
organIds = Arrays.asList(organId.split(",")); organIds = Arrays.asList(organId.split(","));
} }
return disableApplyMapper.disableList(new Page<>(page, pageSize), organIds, districtProvincial, return disableApplyMapper.disableList(new Page<>(pageNum, pageSize), organIds, districtProvincial,
districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName); districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName);
} }
...@@ -98,34 +109,36 @@ public class DisableServiceImpl implements DisableService { ...@@ -98,34 +109,36 @@ public class DisableServiceImpl implements DisableService {
@Override @Override
public void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) { public void disableExamine(String applyId, String checkName, Short applyStatus, String checkRemark) {
ChDisableApply chDisableApply = disableApplyMapper.selectById(applyId);
Date date = new Date(); 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(); ChDisableApplyHis chDisableApplyHis = new ChDisableApplyHis();
BeanUtils.copyProperties(chDisableApply, chDisableApplyHis); BeanUtils.copyProperties(chDisableApply, chDisableApplyHis);
chDisableApplyHis.setCheckName(checkName); disableApplyHisMapper.insert(chDisableApplyHis);
chDisableApplyHis.setApplyStatus(applyStatus); //审核通过
chDisableApplyHis.setCheckRemark(checkRemark);
chDisableApplyHis.setCheckTime(date);
if (applyStatus.equals(Short.valueOf("2"))) { if (applyStatus.equals(Short.valueOf("2"))) {
// 审核通过
chDisableApply.setCheckName(checkName);
chDisableApply.setApplyStatus(applyStatus);
chDisableApply.setCheckRemark(checkRemark);
chDisableApply.setCheckTime(date);
disableApplyMapper.updateById(chDisableApply);
//添加失能人员信息 //添加失能人员信息
ChDisableInfo chDisableInfo = new ChDisableInfo(); ChDisableInfo chDisableInfo = new ChDisableInfo();
BeanUtil.copyProperties(chDisableApply, chDisableInfo); BeanUtil.copyProperties(chDisableApply, chDisableInfo);
disableInfoMapper.insert(chDisableInfo); disableInfoMapper.insert(chDisableInfo);
//添加失能评定信息 //添加失能评定信息
ChAprTask chAprTask = new ChAprTask(); ChAprTask chAprTask = new ChAprTask();
ChCfgPara chCfgPara = cfgParaMapper.selectOne(new QueryWrapper<ChCfgPara>().eq("ORGAN_ID", chAprTask.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); BeanUtil.copyProperties(chDisableApply, chAprTask);
aprTaskMapper.insert(chAprTask); aprTaskMapper.insert(chAprTask);
} }
disableApplyHisMapper.insert(chDisableApplyHis);
} }
@Override @Override
...@@ -218,4 +231,16 @@ public class DisableServiceImpl implements DisableService { ...@@ -218,4 +231,16 @@ public class DisableServiceImpl implements DisableService {
public List<DistrictTreeVo> getAllDistrictTreeData() { public List<DistrictTreeVo> getAllDistrictTreeData() {
return districtMapper.getAllDistrictTreeData(); return districtMapper.getAllDistrictTreeData();
} }
@Override
public List<ChFndDiseaseType> fndAllDisease() {
QueryWrapper<ChFndDiseaseType> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("IS_VALID", "0");
return fndDiseaseTypeMapper.selectList(queryWrapper);
}
@Override
public DisableInfoVO getDisableInfo(String disableInfoId) {
return disableApplyMapper.getDisableInfo(disableInfoId);
}
} }
\ No newline at end of file
apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml
View file @ f888d1fa
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
and a.DISTRICT_CITY = #{city} and a.DISTRICT_CITY = #{city}
</if> </if>
<if test="area != null and area != ''"> <if test="area != null and area != ''">
and a.DISTRICT_AREA = #{area} and a.DISTRICT_AREA = #{area}
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and a.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%') and a.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
...@@ -59,60 +59,60 @@ ...@@ -59,60 +59,60 @@
</select> </select>
<select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO"> <select id="selectDisableExamineInfoByApplyId" resultType="com.hungraim.ltc.pojo.vo.disable.DisableExamineInfoVO">
select a.APPLY_ID applyId, select a.APPLY_ID applyId,
a.organ_id organId, a.organ_id organId,
a.DISTRICT_PROVINCIAL districtProvincial, a.DISTRICT_PROVINCIAL districtProvincial,
a.DISTRICT_CITY districtCity, a.DISTRICT_CITY districtCity,
a.DISTRICT_AREA districtArea, a.DISTRICT_AREA districtArea,
a.REAL_NAME realName, a.REAL_NAME realName,
a.CERTI_CODE certiCode, a.CERTI_CODE certiCode,
a.BIRTHDAY birthday, a.BIRTHDAY birthday,
a.GENDER gender, a.GENDER gender,
a.TEL tel, a.TEL tel,
a.REGIST regist, a.REGIST regist,
a.FIXED_TEL fixedTel, a.FIXED_TEL fixedTel,
a.TREATMENT_TYPE treatmentType, a.TREATMENT_TYPE treatmentType,
a.ACPT_PROVINCIAL acptProvincial, a.ACPT_PROVINCIAL acptProvincial,
a.ACPT_CITY acptCity, a.ACPT_CITY acptCity,
a.ACPT_AREA acptArea, a.ACPT_AREA acptArea,
a.ACPT_STREET acptStreet, a.ACPT_STREET acptStreet,
a.ACPT_ADDRESS acptAddress, a.ACPT_ADDRESS acptAddress,
a.ACPT_SRV_PROVINCIAL acptSrvProvincial, a.ACPT_SRV_PROVINCIAL acptSrvProvincial,
a.ACPT_SRV_CITY acptSrvCity, a.ACPT_SRV_CITY acptSrvCity,
a.ACPT_SRV_AREA acptSrvArea, a.ACPT_SRV_AREA acptSrvArea,
a.ACPT_SRV_STREET acptSrvStreet, a.ACPT_SRV_STREET acptSrvStreet,
a.ACPT_SRV_ADDRESS acptSrvAddress, a.ACPT_SRV_ADDRESS acptSrvAddress,
a.ACPT_SRV_TYPE acptSrvType, a.ACPT_SRV_TYPE acptSrvType,
a.ADRESS_DISTRICT_PROVINCIAL adressDistrictProvincial, a.ADRESS_DISTRICT_PROVINCIAL adressDistrictProvincial,
a.ADRESS_DISTRICT_CITY adressDistrictCity, a.ADRESS_DISTRICT_CITY adressDistrictCity,
a.ADRESS_DISTRICT_CODE adressDistrictCode, a.ADRESS_DISTRICT_CODE adressDistrictCode,
a.STREET street, a.STREET street,
a.ADRESS_DETAIL adressDetail, a.ADRESS_DETAIL adressDetail,
a.ADDRESS_TYPE addressType, a.ADDRESS_TYPE addressType,
a.DISE_TYPE_F diseTypeF, a.DISE_TYPE_F diseTypeF,
a.DISE_TYPE_S diseTypeS, a.DISE_TYPE_S diseTypeS,
a.SRV_MODE_ID srvModeId, a.SRV_MODE_ID srvModeId,
a.DISEASE_DESC diseaseDesc, a.DISEASE_DESC diseaseDesc,
a.MEDICAL_CARD medicalCard, a.MEDICAL_CARD medicalCard,
a.MEDICAL_TYPE medicalType, a.MEDICAL_TYPE medicalType,
a.SRV_ORGAN_ID srvOrganId, a.SRV_ORGAN_ID srvOrganId,
o.PERMIT_ID permitId, o.PERMIT_ID permitId,
a.OPER_NAME operName, a.OPER_NAME operName,
a.OPER_CERTI_CODE operCertiCode, a.OPER_CERTI_CODE operCertiCode,
a.OPER_TEL operTel, a.OPER_TEL operTel,
a.OPER_RELATION operRelation, a.OPER_RELATION operRelation,
a.OPER_FIXED_TEL operFixedTel, a.OPER_FIXED_TEL operFixedTel,
a.OPER_DISTRICT_PROVINCE operDistrictProvince, a.OPER_DISTRICT_PROVINCE operDistrictProvince,
a.OPER_DISTRICT_CITY operDistrictCity, a.OPER_DISTRICT_CITY operDistrictCity,
a.OPER_DISTRICT_CODE operDistrictCode, a.OPER_DISTRICT_CODE operDistrictCode,
a.OPER_STREET operStreet, a.OPER_STREET operStreet,
a.OPER_ADDRESS operAddress, a.OPER_ADDRESS operAddress,
a.CHECK_NAME checkName, a.CHECK_NAME checkName,
a.APPLY_STATUS applyStatus, a.APPLY_STATUS applyStatus,
a.CHECK_REMARK checkRemark a.CHECK_REMARK checkRemark
from CH_DISABLE_APPLY a from CH_DISABLE_APPLY a
LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID LEFT JOIN CH_SRV_ORGAN o ON a.SRV_ORGAN_ID = o.SRV_ORGAN_ID
where a.APPLY_ID = #{applyId} where a.APPLY_ID = #{applyId}
...@@ -129,4 +129,42 @@ ...@@ -129,4 +129,42 @@
where APPLY_ID = #{applyId} where APPLY_ID = #{applyId}
</select> </select>
<select id="getDisableInfo" resultType="com.hungraim.ltc.pojo.vo.disable.DisableInfoVO">
select
--失能人员id
disable.disab_info_id disabInfoId,
--姓名
disable.real_name realName,
--所在省市区
(select district_name from ch_fnd_district dis where disable.district_provincial = dis.district_code) districtProvincial,
(select district_name from ch_fnd_district dis where disable.district_city = dis.district_code) districtCity,
(select district_name from ch_fnd_district dis where disable.district_area = dis.district_code) districtArea,
--手机号码
disable.tel tel,
--性别
disable.gender gender,
--诊断疾病
disable.disease disease,
--家庭住址
(select dis.district_name from ch_fnd_district dis where disable.adress_district_provincial = dis.district_code) adressDistrictProvincial,
(select dis.district_name from ch_fnd_district dis where disable.adress_district_city = dis.district_code) adressDistrictCity,
(select dis.district_name from ch_fnd_district dis where disable.adress_district_code = dis.district_code) adressDistrictCode,
--评定等级
report.evaluate_rating evaluateRating,
--评定完成时间
task.finish_time finishTime,
--申请服务方式
mode1.srv_mode_name srvModeName,
--接受服务地址
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.acpt_srv_provincial = dis.DISTRICT_CODE) acptSrvProvincial,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
(SELECT dis.DISTRICT_NAME FROM CH_FND_DISTRICT dis WHERE disable.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea
from ch_disable_info disable
left join ch_apr_report report on disable.last_task_id = report.task_id
left join ch_apr_task task on disable.last_task_id = task.task_id
left join ch_disable_apply apply on disable.apply_id = apply.apply_id
left join ch_fnd_srv_mode mode1 on apply.srv_mode_id = mode1.srv_mode_id
where disable.disab_info_id = #{disableInfoId}
</select>
</mapper> </mapper>
\ No newline at end of file
assessment/assessment-service/src/main/java/com/hungraim/ltc/controller/TaskController.java
View file @ f888d1fa
...@@ -266,13 +266,18 @@ public class TaskController { ...@@ -266,13 +266,18 @@ public class TaskController {
* @param refuseRemark 拒绝备注 * @param refuseRemark 拒绝备注
*/ */
@RequestMapping("/taskGroupByGroup") @RequestMapping("/taskGroupByGroup")
public Result taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark) { public Result taskGroupByGroup(String groupNumber, Integer status, Short refuseReason, String refuseRemark) {
if (StringUtils.isBlank(groupNumber)) { if (StringUtils.isBlank(groupNumber)) {
return Result.failed("组号不能为空!"); return Result.failed("组号不能为空!");
} }
if (status == null || status < 0 || status > 5) { if (status == null || status < 0 || status > 5) {
return Result.failed("状态异常!"); return Result.failed("状态异常!");
} }
if (status == 4 || status == 5) {
if (refuseReason == null) {
return Result.failed("拒绝原因不能为空!");
}
}
Result<Object> objectResult = taskService.taskGroupByGroup(groupNumber, status, refuseReason, refuseRemark); Result<Object> objectResult = taskService.taskGroupByGroup(groupNumber, status, refuseReason, refuseRemark);
if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) { if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
//失败 //失败
...@@ -290,13 +295,18 @@ public class TaskController { ...@@ -290,13 +295,18 @@ public class TaskController {
* @param refuseRemark 拒绝备注 * @param refuseRemark 拒绝备注
*/ */
@RequestMapping("/taskGroup") @RequestMapping("/taskGroup")
public Result taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark) { public Result taskGroup(Integer pushId, Integer status, Short refuseReason, String refuseRemark) {
if (status == null || status < 0 || status > 5) { if (status == null || status < 0 || status > 5) {
return Result.failed("状态异常!"); return Result.failed("状态异常!");
} }
if (pushId == null) { if (pushId == null) {
return Result.failed("任务组id不能为空!"); return Result.failed("任务组id不能为空!");
} }
if (status == 4 || status == 5) {
if (refuseReason == null) {
return Result.failed("拒绝原因不能为空!");
}
}
Result<Object> objectResult = taskService.taskGroup(pushId, status, refuseReason, refuseRemark); Result<Object> objectResult = taskService.taskGroup(pushId, status, refuseReason, refuseRemark);
if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) { if (!ResultCode.SUCCESS.getCode().equals(objectResult.getCode())) {
//失败 //失败
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/ChCfgAprItemClauseMapper.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprItemClause;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface ChCfgAprItemClauseMapper extends BaseMapper<ChCfgAprItemClause> {
}
\ No newline at end of file
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/ChAprTaskPushMapper.java → assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/ChCfgAprItemMapper.java
View file @ f888d1fa
package com.hungraim.ltc.dao; package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPush; import com.hungraim.ltc.pojo.entity.assessment.ChCfgAprItem;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@Repository
@Mapper @Mapper
public interface ChAprTaskPushMapper extends BaseMapper<ChAprTaskPush> { @Repository
public interface ChCfgAprItemMapper extends BaseMapper<ChCfgAprItem> {
} }
\ No newline at end of file
assessment/assessment-service/src/main/java/com/hungraim/ltc/dao/ChCfgAprMapper.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.assessment.ChCfgApr;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface ChCfgAprMapper extends BaseMapper<ChCfgApr> {
}
\ No newline at end of file
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/TaskService.java
View file @ f888d1fa
...@@ -18,36 +18,11 @@ import java.util.List; ...@@ -18,36 +18,11 @@ import java.util.List;
@Service @Service
public interface TaskService { public interface TaskService {
/**
* 评定任务分配列表
*
* @param organId 适用机构代码
* @param provincial 所在省
* @param city 所在市
* @param area 所在区域
* @param street 所在街道
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param taskName 评定人员姓名
* @param taskTel 评定人员手机号码
* @param daysRemaining 评定剩余天数
* @param status 任务状态
* @param isReturn 是否退回
* @param pageNum 当前页
* @param pageSize 每页几条数据
*/
IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city, IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
String street, String realName, String certiCode, String taskName, String taskTel, String street, String realName, String certiCode, String taskName, String taskTel,
String daysRemaining, String status, String isReturn, String area, String daysRemaining, String status, String isReturn, String area,
int pageNum, int pageSize); int pageNum, int pageSize);
/**
* 评定报告录入列表
*
* @param name 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param tel 失能人员手机号码
*/
List<TaskReportVO> taskReportList(String name, String certiCode, String tel); List<TaskReportVO> taskReportList(String name, String certiCode, String tel);
List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader); List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader);
...@@ -60,7 +35,7 @@ public interface TaskService { ...@@ -60,7 +35,7 @@ public interface TaskService {
List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel); List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel);
Result<Object> taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark); Result<Object> taskGroup(Integer pushId, Integer status, Short refuseReason, String refuseRemark);
List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList(); List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList();
...@@ -68,7 +43,7 @@ public interface TaskService { ...@@ -68,7 +43,7 @@ public interface TaskService {
List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber); List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber);
Result<Object> taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark); Result<Object> taskGroupByGroup(String groupNumber, Integer status, Short refuseReason, String refuseRemark);
TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId); TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId);
......
assessment/assessment-service/src/main/java/com/hungraim/ltc/service/impl/TaskServiceImpl.java
View file @ f888d1fa
...@@ -33,8 +33,6 @@ public class TaskServiceImpl implements TaskService { ...@@ -33,8 +33,6 @@ public class TaskServiceImpl implements TaskService {
@Autowired @Autowired
private AprReportMapper aprReportMapper; private AprReportMapper aprReportMapper;
@Autowired @Autowired
private TaskEmpMapper taskEmpMapper;
@Autowired
private AprPersonInfoMapper personInfoMapper; private AprPersonInfoMapper personInfoMapper;
@Autowired @Autowired
private TaskPushMapper taskPushMapper; private TaskPushMapper taskPushMapper;
...@@ -47,6 +45,24 @@ public class TaskServiceImpl implements TaskService { ...@@ -47,6 +45,24 @@ public class TaskServiceImpl implements TaskService {
@Autowired @Autowired
private RefuseReasonMapper refuseReasonMapper; private RefuseReasonMapper refuseReasonMapper;
/**
* 评定任务分配列表
*
* @param organId 适用机构代码
* @param provincial 所在省
* @param city 所在市
* @param area 所在区域
* @param street 所在街道
* @param realName 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param taskName 评定人员姓名
* @param taskTel 评定人员手机号码
* @param daysRemaining 评定剩余天数
* @param status 任务状态
* @param isReturn 是否退回
* @param pageNum 当前页
* @param pageSize 每页几条数据
*/
@Override @Override
public IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city, public IPage<TaskDistributionVO> taskDistributionList(String organId, String provincial, String city,
String street, String realName, String certiCode, String taskName, String taskTel, String street, String realName, String certiCode, String taskName, String taskTel,
...@@ -60,22 +76,50 @@ public class TaskServiceImpl implements TaskService { ...@@ -60,22 +76,50 @@ public class TaskServiceImpl implements TaskService {
street, realName, certiCode, taskName, taskTel, daysRemaining, status, isReturn, area); street, realName, certiCode, taskName, taskTel, daysRemaining, status, isReturn, area);
} }
/**
* 评定报告录入列表
*
* @param name 失能人员姓名
* @param certiCode 失能人员身份证号码
* @param tel 失能人员手机号码
*/
@Override @Override
public List<TaskReportVO> taskReportList(String name, String certiCode, String tel) { public List<TaskReportVO> taskReportList(String name, String certiCode, String tel) {
return taskMapper.taskReportList(name, certiCode, tel); return taskMapper.taskReportList(name, certiCode, tel);
} }
/**
* 查询评定人员列表
*
* @param organName 评定机构名称
* @param name 评定人员姓名
* @param tel 评定人员手机号码
* @param groupLeader 是否组长0组长，1非组长
*/
@Override @Override
public List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader) { public List<AprEmpVO> aprEmpList(String organName, String name, String tel, String groupLeader) {
return taskMapper.aprEmpList(organName, name, tel, groupLeader); return taskMapper.aprEmpList(organName, name, tel, groupLeader);
} }
/**
* 评定报告新增
*
* @param taskId 评定任务id
* @param person1 鉴定人员1id
* @param person2 鉴定人员2id
* @param person3 鉴定人员3id
* @param evaluateTime 评估时间 格式:2020-11-12
* @param disableLevelId 失能等级id
* @param polNo 保单号
* @param remark 备注
*/
@Override @Override
public Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark) { public Result<Object> addReport(Integer taskId, Integer person1, Integer person2, Integer person3, Date evaluateTime, Integer disableLevelId, String polNo, String remark) {
ChAprTask task = taskMapper.selectById(taskId); ChAprTask task = taskMapper.selectById(taskId);
if (task != null) { if (task != null) {
return Result.failed("已存在的评定任务报告!"); return Result.failed("已存在的评定任务报告!");
} }
//插入评定任务
ChAprReport report = new ChAprReport(); ChAprReport report = new ChAprReport();
report.setTaskId(taskId); report.setTaskId(taskId);
report.setEffTime(new Date()); report.setEffTime(new Date());
...@@ -85,6 +129,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -85,6 +129,7 @@ public class TaskServiceImpl implements TaskService {
report.setStatus(0); report.setStatus(0);
report.setEvaluateTime(evaluateTime); report.setEvaluateTime(evaluateTime);
aprReportMapper.insert(report); aprReportMapper.insert(report);
//插入评定任务关联人员1.2.3(至少一位,最多三位)
//person1 //person1
ChAprPersonInfo person1Info = new ChAprPersonInfo(); ChAprPersonInfo person1Info = new ChAprPersonInfo();
person1Info.setReportId(report.getReportId()); person1Info.setReportId(report.getReportId());
...@@ -108,6 +153,18 @@ public class TaskServiceImpl implements TaskService { ...@@ -108,6 +153,18 @@ public class TaskServiceImpl implements TaskService {
return Result.success(); return Result.success();
} }
/**
* 评定报告修改
*
* @param reportId 评定报告id
* @param person1 鉴定人员1id
* @param person2 鉴定人员2id
* @param person3 鉴定人员3id
* @param evaluateDate 评估时间
* @param disableLevelId 失能等级id
* @param polNo 保单号
* @param remark 备注
*/
@Override @Override
public void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark) { public void updateReport(Integer reportId, Integer person1, Integer person2, Integer person3, Date evaluateDate, Integer disableLevelId, String polNo, String remark) {
//update鉴定报告 //update鉴定报告
...@@ -160,6 +217,12 @@ public class TaskServiceImpl implements TaskService { ...@@ -160,6 +217,12 @@ public class TaskServiceImpl implements TaskService {
} }
} }
/**
* 评定任务分配
*
* @param taskId 评定任务id
* @param empId 评定人员id
*/
@Override @Override
public Result<Object> allotTask(String taskId, String empId) { public Result<Object> allotTask(String taskId, String empId) {
ChAprEmp chAprEmp = aprEmpMapper.selectById(empId); ChAprEmp chAprEmp = aprEmpMapper.selectById(empId);
...@@ -201,43 +264,74 @@ public class TaskServiceImpl implements TaskService { ...@@ -201,43 +264,74 @@ public class TaskServiceImpl implements TaskService {
return Result.success(); return Result.success();
} }
/**
* 评定任务分组管理列表
*
* @param name 评定人员姓名
* @param certiCode 评定人员身份证号码
* @param tel 评定人员手机号码
*/
@Override @Override
public List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel) { public List<TaskGroupVO> taskGroupList(String name, String certiCode, String tel) {
return taskMapper.taskGroupList(name, certiCode, tel); return taskMapper.taskGroupList(name, certiCode, tel);
} }
@Override /**
public Result<Object> taskGroup(Integer pushId, Integer status, Integer refuseReason, String refuseRemark) { * 查询失能等级列表
ChAprTaskPush chAprTaskPush = taskPushMapper.selectById(pushId); */
if (chAprTaskPush == null) {
return Result.failed("不存在的组!");
}
chAprTaskPush.setStatus(status.shortValue());
if (status == 4 || status == 5 || status == 0) {
chAprTaskPush.setRefuseReason(refuseReason.shortValue());
chAprTaskPush.setRefuseRemark(refuseRemark);
}
taskPushMapper.updateById(chAprTaskPush);
return Result.success();
}
@Override @Override
public List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList() { public List<ChCfgSrvDisableLevel> cfgSrvDisableLevelList() {
return cfgSrvDisableLevelMapper.selectList(new QueryWrapper<>()); return cfgSrvDisableLevelMapper.selectList(new QueryWrapper<>());
} }
/**
* 通过报告id查询评定报告人员信息
*
* @param reportId 评定报告id
*/
@Override @Override
public List<PersonInfoVO> personInfoList(String reportId) { public List<PersonInfoVO> personInfoList(String reportId) {
return taskMapper.personInfoList(reportId); return taskMapper.personInfoList(reportId);
} }
/**
* 评定任务分组管理列表详情
*
* @param groupNumber 组号
*/
@Override @Override
public List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber) { public List<TaskGroupInfoVO> taskGroupInfoList(String groupNumber) {
return taskMapper.taskGroupInfoList(groupNumber); return taskMapper.taskGroupInfoList(groupNumber);
} }
@Override @Override
public Result<Object> taskGroupByGroup(String groupNumber, Integer status, Integer refuseReason, String refuseRemark) { public Result<Object> taskGroup(Integer pushId, Integer status, Short refuseReason, String refuseRemark) {
ChAprTaskPush chAprTaskPush = taskPushMapper.selectById(pushId);
if (chAprTaskPush == null) {
return Result.failed("不存在的组!");
}
//更新任务组状态
chAprTaskPush.setStatus(status.shortValue());
chAprTaskPush.setRefuseReason(refuseReason);
chAprTaskPush.setRefuseRemark(refuseRemark);
taskPushMapper.updateById(chAprTaskPush);
//更新评定任务状态
ChAprTask chAprTask = taskMapper.selectById(chAprTaskPush.getTaskId());
chAprTask.setTaskStatus(status);
taskMapper.updateById(chAprTask);
return Result.success();
}
/**
* 评定任务分组管理(整组操作)
*
* @param groupNumber 组号
* @param status 分组状态 未分配(拒绝(重新分配)):0;已分配:1;已接受:2;已完成:3;拒绝（中止）:4,拒绝（终止）:5
* @param refuseReason 拒绝原因id
* @param refuseRemark 拒绝备注
*/
@Override
public Result<Object> taskGroupByGroup(String groupNumber, Integer status, Short refuseReason, String refuseRemark) {
List<ChAprTaskPush> pushList = taskPushMapper.selectList(new QueryWrapper<ChAprTaskPush>().eq("group_number", groupNumber)); List<ChAprTaskPush> pushList = taskPushMapper.selectList(new QueryWrapper<ChAprTaskPush>().eq("group_number", groupNumber));
if (pushList == null || pushList.size() <= 0) { if (pushList == null || pushList.size() <= 0) {
return Result.failed("不存在的组!"); return Result.failed("不存在的组!");
...@@ -251,28 +345,42 @@ public class TaskServiceImpl implements TaskService { ...@@ -251,28 +345,42 @@ public class TaskServiceImpl implements TaskService {
for (ChAprTaskPush push : pushList) { for (ChAprTaskPush push : pushList) {
//更新任务组状态 //更新任务组状态
push.setStatus(status.shortValue()); push.setStatus(status.shortValue());
if (status == 4 || status == 5 || status == 0) { push.setRefuseReason(refuseReason);
push.setRefuseReason(refuseReason.shortValue()); push.setRefuseRemark(refuseRemark);
push.setRefuseRemark(refuseRemark);
}
taskPushMapper.updateById(push); taskPushMapper.updateById(push);
//更新评定任务状态 //更新评定任务状态
ChAprTask chAprTask = taskMapper.selectById(push.getTaskId()); ChAprTask chAprTask = taskMapper.selectById(push.getTaskId());
chAprTask.setTaskStatus(status); chAprTask.setTaskStatus(status);
taskMapper.updateById(chAprTask);
} }
return Result.success(); return Result.success();
} }
/**
* 评定任务分组管理列表详情详情
*
* @param pushId 任务组id
*/
@Override @Override
public TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId) { public TaskGroupInfoListInfoVO taskGroupInfoListInfo(String pushId) {
return taskMapper.taskGroupInfoListInfo(pushId); return taskMapper.taskGroupInfoListInfo(pushId);
} }
/**
* 分配历史信息列表
*/
@Override @Override
public List<AllotTaskHisVO> allotTaskHisList() { public List<AllotTaskHisVO> allotTaskHisList() {
return taskMapper.allotTaskHisList(); return taskMapper.allotTaskHisList();
} }
/**
* 设置预约日期和备注
*
* @param pushId 分组id
* @param timeDate 预约日期
* @param remark 备注
*/
@Override @Override
public Result<Object> updatePushTimeAndRemark(String pushId, Date timeDate, String remark) { public Result<Object> updatePushTimeAndRemark(String pushId, Date timeDate, String remark) {
ChAprTaskPush chAprTaskPush = taskPushMapper.selectById(pushId); ChAprTaskPush chAprTaskPush = taskPushMapper.selectById(pushId);
......
assessment/assessment-service/src/main/resources/mapper/ChAprTaskPushMapper.xml deleted 100644 → 0
View file @ b07948ac
<?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.ChAprTaskPushMapper">
<resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.assessment.ChAprTaskPush">
<id column="TASK_PUSH_ID" jdbcType="DECIMAL" property="taskPushId"/>
<result column="TASK_POOL_ID" jdbcType="VARCHAR" property="taskPoolId"/>
<result column="TIME" jdbcType="TIMESTAMP" property="time"/>
<result column="EVALUATE_ADDRESS_ID" jdbcType="DECIMAL" property="evaluateAddressId"/>
<result column="GROUP_NUMBER" jdbcType="VARCHAR" property="groupNumber"/>
<result column="ORDER_NUMBER" jdbcType="DECIMAL" property="orderNumber"/>
<result column="TASK_ID" jdbcType="DECIMAL" property="taskId"/>
<result column="PLANNED_ARRIVAL_TIME" jdbcType="TIMESTAMP" property="plannedArrivalTime"/>
<result column="PLANNED_DEPARTURE_TIME" jdbcType="TIMESTAMP" property="plannedDepartureTime"/>
<result column="DISTANCE_STATION_KILOMETERS" jdbcType="DECIMAL" property="distanceStationKilometers"/>
<result column="DISTANCE_STATION_TRAVEL_TIME" jdbcType="DECIMAL" property="distanceStationTravelTime" />
<result column="TOTAL_DISTANCE" jdbcType="DECIMAL" property="totalDistance" />
<result column="LENGTH_OF_TIME" jdbcType="DECIMAL" property="lengthOfTime" />
<result column="SEND_ID" jdbcType="DECIMAL" property="sendId" />
<result column="EMP_ID" jdbcType="DECIMAL" property="empId" />
<result column="STATUS" jdbcType="DECIMAL" property="status" />
<result column="FCD" jdbcType="TIMESTAMP" property="fcd" />
<result column="FCU" jdbcType="DECIMAL" property="fcu" />
<result column="LCD" jdbcType="TIMESTAMP" property="lcd" />
<result column="LCU" jdbcType="DECIMAL" property="lcu" />
<result column="SETOUT_DATE" jdbcType="TIMESTAMP" property="setoutDate" />
<result column="TASK_GROUP_NO" jdbcType="VARCHAR" property="taskGroupNo" />
<result column="ROUTE_START_LOCATION" jdbcType="VARCHAR" property="routeStartLocation" />
<result column="ROUTE_END_LOCATION" jdbcType="VARCHAR" property="routeEndLocation" />
<result column="ROUTE_START_TIME" jdbcType="TIMESTAMP" property="routeStartTime" />
<result column="ROUTE_END_TIME" jdbcType="TIMESTAMP" property="routeEndTime" />
<result column="STOP_LOCATION" jdbcType="VARCHAR" property="stopLocation" />
<result column="DATA_FROM" jdbcType="DECIMAL" property="dataFrom" />
<result column="ACCEPT_TIME" jdbcType="TIMESTAMP" property="acceptTime" />
<result column="ACCEPT_EMP" jdbcType="DECIMAL" property="acceptEmp" />
<result column="ACCEPT_ORGAN_NAME" jdbcType="DECIMAL" property="acceptOrganName" />
<result column="REFUSE_REASON" jdbcType="DECIMAL" property="refuseReason" />
<result column="REFUSE_REMARK" jdbcType="VARCHAR" property="refuseRemark" />
<result column="REFUSE_TIME" jdbcType="TIMESTAMP" property="refuseTime" />
<result column="REFUSE_EMP" jdbcType="DECIMAL" property="refuseEmp" />
<result column="REFUSE_ORGAN_NAME" jdbcType="DECIMAL" property="refuseOrganName" />
<result column="ASSIGN_TIME" jdbcType="TIMESTAMP" property="assignTime" />
<result column="ASSIGN_EMP" jdbcType="DECIMAL" property="assignEmp" />
<result column="ASSIGN_ORGAN_NAME" jdbcType="DECIMAL" property="assignOrganName" />
<result column="IS_MANUAL" jdbcType="DECIMAL" property="isManual" />
<result column="FINISH_TIME" jdbcType="TIMESTAMP" property="finishTime" />
<result column="FINISH_EMP" jdbcType="DECIMAL" property="finishEmp" />
<result column="FINISH_ORGAN_NAME" jdbcType="DECIMAL" property="finishOrganName" />
<result column="TASK_APPOINTMENT_DATE" jdbcType="TIMESTAMP" property="taskAppointmentDate" />
<result column="APPOINTMENT_REMARK" jdbcType="VARCHAR" property="appointmentRemark" />
</resultMap>
</mapper>
\ No newline at end of file
assessment/assessment-service/src/main/resources/mapper/ChCfgAprItemClauseMapper.xml 0 → 100644
View file @ f888d1fa
<?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.ChCfgAprItemClauseMapper">
<resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.assessment.ChCfgAprItemClause">
<id column="CLAUSE_ID" jdbcType="DECIMAL" property="clauseId" />
<result column="CLAUSE_DESC" jdbcType="VARCHAR" property="clauseDesc" />
<result column="CLAUSE_VALUE" jdbcType="DECIMAL" property="clauseValue" />
<result column="ITEM_ID" jdbcType="DECIMAL" property="itemId" />
<result column="APR_ID" jdbcType="DECIMAL" property="aprId" />
<result column="FCD" jdbcType="TIMESTAMP" property="fcd" />
<result column="FCU" jdbcType="DECIMAL" property="fcu" />
<result column="TASK_SCORE_ID" jdbcType="DECIMAL" property="taskScoreId" />
</resultMap>
<sql id="Base_Column_List">
CLAUSE_ID, CLAUSE_DESC, CLAUSE_VALUE, ITEM_ID, APR_ID, FCD, FCU, TASK_SCORE_ID
</sql>
</mapper>
\ No newline at end of file
assessment/assessment-service/src/main/resources/mapper/ChCfgAprItemMapper.xml 0 → 100644
View file @ f888d1fa
<?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.ChCfgAprItemMapper">
<resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.assessment.ChCfgAprItem">
<id column="ITEM_ID" jdbcType="DECIMAL" property="itemId" />
<result column="ITEM_NAME" jdbcType="VARCHAR" property="itemName" />
<result column="MIN_VALUE" jdbcType="DECIMAL" property="minValue" />
<result column="MAX_VALUE" jdbcType="DECIMAL" property="maxValue" />
<result column="APR_ID" jdbcType="DECIMAL" property="aprId" />
<result column="FCD" jdbcType="TIMESTAMP" property="fcd" />
<result column="FCU" jdbcType="DECIMAL" property="fcu" />
</resultMap>
<sql id="Base_Column_List">
ITEM_ID, ITEM_NAME, MIN_VALUE, MAX_VALUE, APR_ID, FCD, FCU
</sql>
</mapper>
\ No newline at end of file
assessment/assessment-service/src/main/resources/mapper/ChCfgAprMapper.xml 0 → 100644
View file @ f888d1fa
<?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.ChCfgAprMapper">
<resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.assessment.ChCfgApr">
<id column="APR_ID" jdbcType="DECIMAL" property="aprId" />
<result column="ORGAN_ID" jdbcType="VARCHAR" property="organId" />
<result column="ESTIMATE_NAME" jdbcType="VARCHAR" property="estimateName" />
<result column="REMARK" jdbcType="VARCHAR" property="remark" />
<result column="STATUS" jdbcType="DECIMAL" property="status" />
<result column="DEFINE_EMP" jdbcType="DECIMAL" property="defineEmp" />
<result column="EFF_TIME" jdbcType="TIMESTAMP" property="effTime" />
<result column="END_EMP" jdbcType="DECIMAL" property="endEmp" />
<result column="END_TIME" jdbcType="TIMESTAMP" property="endTime" />
<result column="FCD" jdbcType="TIMESTAMP" property="fcd" />
<result column="FCU" jdbcType="DECIMAL" property="fcu" />
<result column="LCD" jdbcType="TIMESTAMP" property="lcd" />
<result column="LCU" jdbcType="DECIMAL" property="lcu" />
</resultMap>
<sql id="Base_Column_List">
APR_ID, ORGAN_ID, ESTIMATE_NAME, REMARK, "STATUS", DEFINE_EMP, EFF_TIME, END_EMP,
END_TIME, FCD, FCU, LCD, LCU
</sql></mapper>
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChCfgApr.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.pojo.entity.assessment;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* CH_CFG_APR
* @author
*/
@Data
@TableName("CH_CFG_APR")
@KeySequence("SEQ_CH_CFG_APR")
public class ChCfgApr implements Serializable {
/**
* 鉴定配置id
*/
@TableId(type = IdType.INPUT)
private Long aprId;
/**
* 机构代码
*/
private String organId;
/**
* 鉴定配置名称
*/
private String estimateName;
/**
* 备注
*/
private String remark;
/**
* 状态 未生效：0；已生效：1；已失效：2
*/
private Short status;
/**
* 创建人
*/
private Long defineEmp;
/**
* 创建时间
*/
private Date effTime;
/**
* 终止人
*/
private Long endEmp;
/**
* 终止时间
*/
private Date endTime;
/**
* 首次操作时间
*/
private Date fcd;
/**
* 首次操作人
*/
private Long fcu;
/**
* 末次操作时间
*/
private Date lcd;
/**
* 末次操作人
*/
private Long lcu;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChCfgAprItem.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.pojo.entity.assessment;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* CH_CFG_APR_ITEM
* @author
*/
@Data
@TableName("CH_CFG_APR_ITEM")
@KeySequence("SEQ_CH_CFG_APR_ITEM")
public class ChCfgAprItem implements Serializable {
/**
* 鉴定项目id
*/
@TableId(type = IdType.INPUT)
private Long itemId;
/**
* 鉴定项目名称
*/
private String itemName;
/**
* 最小值
*/
private Short minValue;
/**
* 最大值
*/
private Short maxValue;
/**
* 鉴定配置id
*/
private Long aprId;
/**
* 首次操作时间
*/
private Date fcd;
/**
* 首次操作人
*/
private Long fcu;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/assessment/ChCfgAprItemClause.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.pojo.entity.assessment;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* CH_CFG_APR_ITEM_CLAUSE
* @author
*/
@Data
@TableName("CH_CFG_APR_ITEM_CLAUSE")
@KeySequence("SEQ_CH_CFG_APR_ITEM_CLAUSE")
public class ChCfgAprItemClause implements Serializable {
/**
* 鉴定明细id
*/
@TableId(type = IdType.INPUT)
private Long clauseId;
/**
* 鉴定明细描述
*/
private String clauseDesc;
/**
* 参考分值
*/
private Short clauseValue;
/**
* 鉴定项目id
*/
private Long itemId;
/**
* 鉴定配置id
*/
private Long aprId;
/**
* 首次操作时间
*/
private Date fcd;
/**
* 首次操作人
*/
private Long fcu;
/**
* 分数对应id
*/
private Short taskScoreId;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChEmpType.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.pojo.entity.serviceManage;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
/**
* CH_EMP_TYPE
* @author
*/
@Data
@TableName("CH_EMP_TYPE")
@KeySequence("SEQ_CH_EMP_TYPE")
public class ChEmpType implements Serializable {
/**
* 类型id
*/
@TableId(type = IdType.INPUT)
private Long empType;
/**
* 类型NAME
*/
private String empTypeName;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvProgram.java
View file @ f888d1fa
...@@ -17,32 +17,32 @@ public class ChSrvProgram { ...@@ -17,32 +17,32 @@ public class ChSrvProgram {
* 服务方案ID * 服务方案ID
*/ */
@TableId(type = IdType.INPUT) @TableId(type = IdType.INPUT)
private Integer programId; private Long programId;
/** /**
* 服务方案配置ID * 服务方案配置ID
*/ */
private Integer itemCfgId; private Long itemCfgId;
/** /**
* 服务机构ID * 服务机构ID
*/ */
private Integer srvOrganId; private Long srvOrganId;
/** /**
* 服务方式ID * 服务方式ID
*/ */
private Integer srvModeId; private Long srvModeId;
/** /**
* 失能人员ID * 失能人员ID
*/ */
private Integer disabInfoId; private Long disabInfoId;
/** /**
* 创建人 * 创建人
*/ */
private Integer defineEmp; private Long defineEmp;
/** /**
* 创建时间 * 创建时间
...@@ -52,7 +52,7 @@ public class ChSrvProgram { ...@@ -52,7 +52,7 @@ public class ChSrvProgram {
/** /**
* 终止人 * 终止人
*/ */
private Integer endEmp; private Long endEmp;
/** /**
* 终止时间 * 终止时间
...@@ -67,7 +67,7 @@ public class ChSrvProgram { ...@@ -67,7 +67,7 @@ public class ChSrvProgram {
/** /**
* 首次操作人 * 首次操作人
*/ */
private Integer fcu; private Long fcu;
/** /**
* 末次操作时间 * 末次操作时间
...@@ -77,7 +77,7 @@ public class ChSrvProgram { ...@@ -77,7 +77,7 @@ public class ChSrvProgram {
/** /**
* 末次操作人 * 末次操作人
*/ */
private Integer lcu; private Long lcu;
/** /**
* 服务方案状态 0：未生效、1：已生效、2：已终止 * 服务方案状态 0：未生效、1：已生效、2：已终止
...@@ -102,17 +102,17 @@ public class ChSrvProgram { ...@@ -102,17 +102,17 @@ public class ChSrvProgram {
/** /**
* 网厅创建人 * 网厅创建人
*/ */
private Integer webDefineEmp; private Long webDefineEmp;
/** /**
* 网厅终止人 * 网厅终止人
*/ */
private Integer webEndEmp; private Long webEndEmp;
/** /**
* 数据来源 网厅：0，核心：1 * 数据来源 网厅：0，核心：1
*/ */
private Integer dataFrom; private Long dataFrom;
/** /**
* 当前待遇起始日期 * 当前待遇起始日期
...@@ -147,11 +147,11 @@ public class ChSrvProgram { ...@@ -147,11 +147,11 @@ public class ChSrvProgram {
/** /**
* 计费方式(0,项目收费、1,时长收费,2，两者并存) * 计费方式(0,项目收费、1,时长收费,2，两者并存)
*/ */
private Integer chargeType; private Long chargeType;
/** /**
* 建床ID * 建床ID
*/ */
private Integer buildBedId; private Long buildBedId;
} }
common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChSrvProgramSet.java
View file @ f888d1fa
...@@ -42,7 +42,7 @@ public class ChSrvProgramSet implements Serializable { ...@@ -42,7 +42,7 @@ public class ChSrvProgramSet implements Serializable {
/** /**
* 服务频次 * 服务频次
*/ */
private Short itemTimes; private Integer itemTimes;
/** /**
* 创建人 * 创建人
...@@ -112,12 +112,12 @@ public class ChSrvProgramSet implements Serializable { ...@@ -112,12 +112,12 @@ public class ChSrvProgramSet implements Serializable {
/** /**
* 服务项目分类 * 服务项目分类
*/ */
private Long itemType; private Integer itemType;
/** /**
* 是否必选 * 是否必选
*/ */
private Short chooseFlag; private Integer chooseFlag;
/** /**
* 付款类型 * 付款类型
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableInfoVO.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.pojo.vo.disable;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 失能人员信息列表VO
*/
@Data
public class DisableInfoVO implements Serializable {
/**
* 失能人员id
*/
private String disabInfoId;
/**
* 姓名
*/
private String realName;
/**
* 所在省市区
*/
private String districtProvincial;
private String districtCity;
private String districtArea;
/**
* 手机号码
*/
private String tel;
/**
* 性别
*/
private String gender;
/**
* 诊断疾病
*/
private String disease;
/**
* 家庭住址
*/
private String adressDistrictProvincial;
private String adressDistrictCity;
private String adressDistrictCode;
/**
* 评定等级
*/
private String evaluateRating;
/**
* 评定完成时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date finishTime;
/**
* 申请服务方式
*/
private String srvModeName;
/**
* 接受服务地址
*/
private String acptSrvProvincial;
private String acptSrvCity;
private String acptSrvArea;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableVO.java
View file @ f888d1fa
package com.hungraim.ltc.pojo.vo.disable; package com.hungraim.ltc.pojo.vo.disable;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
...@@ -11,7 +10,6 @@ import java.util.Date; ...@@ -11,7 +10,6 @@ import java.util.Date;
* 失能人员信息列表VO * 失能人员信息列表VO
*/ */
@Data @Data
@TableName("")
public class DisableVO implements Serializable { public class DisableVO implements Serializable {
//id //id
private String applyId; private String applyId;
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramDetailVo.java
View file @ f888d1fa
...@@ -2,6 +2,7 @@ package com.hungraim.ltc.pojo.vo.governance; ...@@ -2,6 +2,7 @@ package com.hungraim.ltc.pojo.vo.governance;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -28,6 +29,11 @@ public class ProgramDetailVo { ...@@ -28,6 +29,11 @@ public class ProgramDetailVo {
private Long disabInfoId; private Long disabInfoId;
/** /**
* 服务方式id
*/
private Long srvModeId;
/**
* 失能人员所在省 * 失能人员所在省
*/ */
private String disableDistrictProvincial; private String disableDistrictProvincial;
...@@ -55,7 +61,8 @@ public class ProgramDetailVo { ...@@ -55,7 +61,8 @@ public class ProgramDetailVo {
/** /**
* 失能人员生日 * 失能人员生日
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday; private Date birthday;
/** /**
...@@ -96,7 +103,8 @@ public class ProgramDetailVo { ...@@ -96,7 +103,8 @@ public class ProgramDetailVo {
/** /**
* 评定完成日期 * 评定完成日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date assessDate; private Date assessDate;
/** /**
...@@ -112,13 +120,15 @@ public class ProgramDetailVo { ...@@ -112,13 +120,15 @@ public class ProgramDetailVo {
/** /**
* 方案生效时间 * 方案生效时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date programDate; private Date programDate;
/** /**
* 方案结束时间 * 方案结束时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date programEndDate; private Date programEndDate;
/** /**
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/ProgramSetAndProjectVo.java
View file @ f888d1fa
...@@ -30,17 +30,17 @@ public class ProgramSetAndProjectVo { ...@@ -30,17 +30,17 @@ public class ProgramSetAndProjectVo {
/** /**
* 类服务包类型(1基础护理、2日常照护项目、3其它、4巡诊) * 类服务包类型(1基础护理、2日常照护项目、3其它、4巡诊)
*/ */
private Short categoryType; private Integer categoryType;
/** /**
* 频次 * 频次
*/ */
private Long itemTimes; private Integer itemTimes;
/** /**
* 频次类型(1:次/每月，2:必要时） * 频次类型(1:次/每月，2:必要时）
*/ */
private Short itemTimesType; private Integer itemTimesType;
/** /**
* 单价 * 单价
...@@ -50,7 +50,7 @@ public class ProgramSetAndProjectVo { ...@@ -50,7 +50,7 @@ public class ProgramSetAndProjectVo {
/** /**
* 是否必需项(是：1；否：0) * 是否必需项(是：1；否：0)
*/ */
private Short isNeed; private Integer isNeed;
/** /**
* 备注 * 备注
...@@ -60,7 +60,7 @@ public class ProgramSetAndProjectVo { ...@@ -60,7 +60,7 @@ public class ProgramSetAndProjectVo {
/** /**
* 是否配置 (是：1；否：0) * 是否配置 (是：1；否：0)
*/ */
private Short isConf; private Short isConf = 1;
/** /**
* 计划频次 * 计划频次
...@@ -70,6 +70,6 @@ public class ProgramSetAndProjectVo { ...@@ -70,6 +70,6 @@ public class ProgramSetAndProjectVo {
/** /**
* 计划频次类型(1：次/每月，2：次/每天，3：次/每周；) * 计划频次类型(1：次/每月，2：次/每天，3：次/每周；)
*/ */
private Short planningFrequencyType; private Short planningFrequencyType = 1;
} }
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskInfoVO.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.pojo.vo.governance;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hungraim.ltc.pojo.entity.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 服务计划详情VO
*/
@Data
public class SrvTaskInfoVO extends PageInfo implements Serializable {
/**
* 服务计划id
*/
private String srvTaskId;
/**
* 服务计划明细id
*/
private String taskDetailId;
/**
* 服务人员姓名
*/
private String empName;
/**
* 服务方案起始日
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date srvStartTime;
/**
* 服务方案终止日
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date srvEndTime;
}
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskVO.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.pojo.vo.governance;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hungraim.ltc.pojo.entity.PageInfo;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 服务计划列表VO
*/
@Data
public class SrvTaskVO extends PageInfo implements Serializable {
/**
* 服务计划id
*/
private Integer srvTaskId;
/**
* 服务方案id
*/
private Integer programId;
/**
* 失能人员id
*/
private Integer disabInfoId;
/**
* 所在省市
*/
private String districtProvincial;
private String districtCity;
private String districtArea;
/**
* 失能人员姓名
*/
private String realName;
/**
* 手机号码
*/
private String tel;
/**
* 年龄
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
/**
* 性别
*/
private String gender;
/**
* 诊断疾病
*/
private String disease;
/**
* 失能等级
*/
private String disableLevelName;
/**
* 接受服务地址
*/
private String acptSrvProvincial;
private String acptSrvCity;
private String acptSrvArea;
private String acptSrvStreet;
/**
* 评定等级
*/
private String evaluateRatingType;
/**
* 评定完成日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date evaluateRafinishTimetingType;
/**
* 服务方式
*/
private String srvModeName;
/**
* 护理机构名称
*/
private String srvOrganName;
/**
* 护理服务人员
*/
private String empName;
/**
* 任务时间
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date effTime;
/**
* 任务状态(服务计划状态)
*/
private String status;
/**
* 服务方案状态
*/
private String progStatus;
/**
* 服务方案起始日
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date srvStartTime;
/**
* 服务方案终止日
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date srvEndTime;
}
common/common-core/src/main/java/com/hungraim/ltc/util/ResultCode.java
View file @ f888d1fa
...@@ -7,40 +7,46 @@ import java.io.Serializable; ...@@ -7,40 +7,46 @@ import java.io.Serializable;
/** /**
* 常用的Result * 常用的Result
*
* @author hubin * @author hubin
*/ */
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public enum ResultCode implements IResultCode, Serializable { public enum ResultCode implements IResultCode, Serializable {
//成功 //成功
SUCCESS("00000", "一切ok"), SUCCESS("00000", "一切ok"),
//用户登陆异常 //用户登陆异常
USER_LOGIN_ERROR("U0001", "用户登录异常"), USER_LOGIN_ERROR("U0001", "用户登录异常"),
USER_NOT_EXIST("U0002", "用户不存在"), USER_NOT_EXIST("U0002", "用户不存在"),
MARKETER_NOT_EXIST("U0003", "营销员信息未找到"), MARKETER_NOT_EXIST("U0003", "营销员信息未找到"),
USERNAME_OR_PASSWORD_ERROR("U0003", "用户名密码错误"), USERNAME_OR_PASSWORD_ERROR("U0003", "用户名密码错误"),
//系统执行出错 //系统执行出错
SYSTEM_EXECUTION_ERROR("S0001", "系统异常"), SYSTEM_EXECUTION_ERROR("S0001", "系统异常"),
//客户端认证失败 //客户端认证失败
CLIENT_AUTHENTICATION_FAILED("A0001", "客户端认证失败"), CLIENT_AUTHENTICATION_FAILED("A0001", "客户端认证失败"),
//没有访问权限 //没有访问权限
NO_AUTHORITY("A0002", "没有访问权限"), NO_AUTHORITY("A0002", "没有访问权限"),
AUTHORIZED_ERROR("A0300", "访问权限异常"), AUTHORIZED_ERROR("A0300", "访问权限异常"),
ACCESS_UNAUTHORIZED("A0301", "访问未授权"), ACCESS_UNAUTHORIZED("A0301", "访问未授权"),
TOKEN_INVALID_OR_EXPIRED("A0230", "token无效或已过期"), TOKEN_INVALID_OR_EXPIRED("A0230", "token无效或已过期"),
// 请求参数错误，参数校验不通过
REQUEST_PARAM_ERROR("Q0001", "请求参数错误"),
/**
* 制定服务方案失败，请先终止其它服务方案
*/
REQUEST_PROGRAM_ADD_ERROR("Q0002", "制定服务方案失败，请先终止其它服务方案");;
; private String code;
private String code; private String msg;
private String msg; @Override
@Override public String getCode() {
public String getCode() { return code;
return code; }
}
@Override @Override
public String getMsg() { public String getMsg() {
return msg; return msg;
} }
} }
governance/src/main/java/com/hungraim/ltc/GovernanceApplication.java
View file @ f888d1fa
...@@ -3,12 +3,14 @@ package com.hungraim.ltc; ...@@ -3,12 +3,14 @@ package com.hungraim.ltc;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/** /**
* @author jiaguokai * @author jiaguokai
*/ */
@SpringBootApplication @SpringBootApplication
@EnableDiscoveryClient @EnableDiscoveryClient
@EnableTransactionManagement
public class GovernanceApplication { public class GovernanceApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(GovernanceApplication.class, args); SpringApplication.run(GovernanceApplication.class, args);
......
governance/src/main/java/com/hungraim/ltc/governance/controller/SrvProgramController.java
View file @ f888d1fa
package com.hungraim.ltc.governance.controller; package com.hungraim.ltc.governance.controller;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.governance.service.SrvProgramService;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo; import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
import com.hungraim.ltc.pojo.vo.governance.ProgramListVo; import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
import com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo;
import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo; import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
import com.hungraim.ltc.governance.service.SrvProgramService;
import com.hungraim.ltc.util.Result; import com.hungraim.ltc.util.Result;
import com.hungraim.ltc.util.ResultCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import java.util.List;
@RestController @RestController
@RequestMapping("/api.governance/srvProgram") @RequestMapping("/api.governance/srvProgram")
...@@ -44,7 +48,7 @@ public class SrvProgramController { ...@@ -44,7 +48,7 @@ public class SrvProgramController {
@RequestMapping("/programList") @RequestMapping("/programList")
public Result getProgramList(Long srvOrganId, String realName, String realTel, String programStatus, Integer pageNum, Integer pageSize) { public Result getProgramList(Long srvOrganId, String realName, String realTel, String programStatus, Integer pageNum, Integer pageSize) {
if (pageNum == null || pageNum < 1) { if (pageNum == null || pageNum < 1) {
return Result.failed("参数错误"); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (pageSize == null || pageSize < 1) { if (pageSize == null || pageSize < 1) {
pageSize = 10; pageSize = 10;
...@@ -66,13 +70,13 @@ public class SrvProgramController { ...@@ -66,13 +70,13 @@ public class SrvProgramController {
@RequestMapping("/programSetList") @RequestMapping("/programSetList")
public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId) { public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId) {
if (pageNum == null || pageNum < 1 || disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) { if (pageNum == null || pageNum < 1 || disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) {
return Result.failed("参数错误"); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
if (pageSize == null || pageSize < 1) { if (pageSize == null || pageSize < 1) {
pageSize = 10; pageSize = 10;
} }
Page<ProgramListVo> page = new Page<>(pageNum, pageSize); Page<ProgramListVo> page = new Page<>(pageNum, pageSize);
page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId); page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId, null);
return Result.success(page); return Result.success(page);
} }
...@@ -85,7 +89,7 @@ public class SrvProgramController { ...@@ -85,7 +89,7 @@ public class SrvProgramController {
@RequestMapping("/programDetail") @RequestMapping("/programDetail")
public Result getProgramDetail(Long programId) { public Result getProgramDetail(Long programId) {
if (programId == null || programId == 0) { if (programId == null || programId == 0) {
return Result.failed("参数错误"); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
ProgramDetailVo programDetail = srvProgramService.getProgramDetail(programId); ProgramDetailVo programDetail = srvProgramService.getProgramDetail(programId);
return Result.success(programDetail); return Result.success(programDetail);
...@@ -101,9 +105,58 @@ public class SrvProgramController { ...@@ -101,9 +105,58 @@ public class SrvProgramController {
@RequestMapping("/programDetailWithAdd") @RequestMapping("/programDetailWithAdd")
public Result getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId) { public Result getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId) {
if (disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) { if (disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) {
return Result.failed("参数错误"); return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} }
ProgramDetailVo programDetail = srvProgramService.getProgramDetailWithAdd(disabInfoId, srvOrganId); ProgramDetailVo programDetail = srvProgramService.getProgramDetailWithAdd(disabInfoId, srvOrganId);
return Result.success(programDetail); return Result.success(programDetail);
} }
/**
* 添加服务方案接口
*
* @param programDetailVo 添加服务方案包装对象
* @return 返回结果
*/
@PostMapping("/programAndProgramSetList")
public Result programAndProgramSetList(ProgramDetailVo programDetailVo) {
log.info(JSONUtil.toJsonStr(programDetailVo));
// 参数校验
if (programDetailVo != null) {
if (null == programDetailVo.getSrvOrganId() || null == programDetailVo.getDisabInfoId() || programDetailVo.getProgramSetAndProjectVos() == null || programDetailVo.getProgramSetAndProjectVos().size() == 0) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
} else {
List<ProgramSetAndProjectVo> programSetAndProjectVos = programDetailVo.getProgramSetAndProjectVos();
for (ProgramSetAndProjectVo programSetAndProjectVo : programSetAndProjectVos) {
if (programSetAndProjectVo.getIsConf().intValue() == 1 && programSetAndProjectVo.getPlanningFrequency() == null) {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
}
}
} else {
return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
}
// 添加的话，需要校验其它服务方案是否已终止
if (programDetailVo.getProgramId() == null) {
List<ChSrvProgram> srvPrograms = srvProgramService.getProgramSetCountByProgStatus(programDetailVo.getDisabInfoId(), programDetailVo.getSrvOrganId(), "2");
if (srvPrograms.size() > 0) {
return Result.failed(ResultCode.REQUEST_PROGRAM_ADD_ERROR);
}
}
// 进行添加或者修改操作
srvProgramService.addProgramAndProgramSetList(programDetailVo);
return Result.success();
}
/**
* 终止服务方案
*
* @param programId 服务方案id
* @param endReason 终止原因
* @return 返回请求结果
*/
@PutMapping("/endProgram")
public Result endProgram(Long programId, String endReason) {
srvProgramService.endProgram(programId, endReason);
return Result.success();
}
} }
governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskController.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.governance.controller;
import com.hungraim.ltc.governance.service.SrvTaskService;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskInfoVO;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
import com.hungraim.ltc.util.DateUtils;
import com.hungraim.ltc.util.Result;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
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.governance/srvTask")
@Slf4j
public class SrvTaskController {
@Autowired
private SrvTaskService srvTaskService;
/**
* 服务计划、服务计划配置列表
*
* @param organId 护理机构id
* @param disableName 失能人员姓名
* @param disableTel 失能人员手机号码
* @param empName 护理人员姓名
* @param certifNum 护理人员证件号码
* @param startTime 服务计划开始时间
* @param endTime 服务计划结束时间
* @param status 任务状态（服务计划状态）
* @param modeId 服务方式
*/
@RequestMapping("/getSrvTaskList")
public Result<List<SrvTaskVO>> getSrvTaskList(Integer organId, String disableName, String disableTel,
String empName, String certifNum, String startTime, String endTime,
String status, String modeId) {
List<SrvTaskVO> tasks = srvTaskService.getSrvTaskList(organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
return Result.success(tasks);
}
/**
* 查询服务计划制定详情
*
* @param taskId 服务计划id
*/
@RequestMapping("/getSrvTaskInfo")
public Result<SrvTaskInfoVO> getSrvTaskInfo(String taskId) {
if (StringUtils.isBlank(taskId)) {
return Result.failed("taskId不能为空!");
}
SrvTaskInfoVO taskInfo = srvTaskService.getSrvTaskInfo(taskId);
return Result.success(taskInfo);
}
/**
* 新增服务计划
*
* @param programId 服务方案id
* @param srvEmpId 护理人员id
* @param startTime 服务计划开始时间 yyyy-MM-dd
* @param endTime 服务计划结束时间 yyyy-MM-dd
*/
@RequestMapping("/addSrvTask")
public Result<Object> addSrvTask(Long programId, Long srvEmpId, String startTime, String endTime) {
if (programId == null) {
return Result.failed("服务方案id不能为空!");
}
if (srvEmpId == null) {
return Result.failed("护理人员id不能为空!");
}
if (StringUtils.isBlank(startTime)) {
return Result.failed("服务计划开始时间不能为空!");
}
if (StringUtils.isBlank(endTime)) {
return Result.failed("服务计划结束时间不能为空!");
}
try {
srvTaskService.addSrvTask(programId, srvEmpId, DateUtils.strToDate(startTime), DateUtils.strToDate(endTime));
} catch (RuntimeException e) {
//添加失败
return Result.failed(e.getMessage());
}
//添加成功
return Result.success();
}
/**
* 修改服务计划
*
* @param taskId 服务计划id
* @param srvEmpId 护理人员id
* @param startTime 服务计划开始时间 yyyy-MM-dd
* @param endTime 服务计划结束时间 yyyy-MM-dd
*/
@RequestMapping("/updateSrvTask")
public Result<Object> updateSrvTask(String taskId, Long srvEmpId, String startTime, String endTime) {
if (taskId == null) {
return Result.failed("taskId不能为空!");
}
if (srvEmpId == null) {
return Result.failed("护理人员id不能为空!");
}
if (StringUtils.isBlank(startTime)) {
return Result.failed("服务计划开始时间不能为空!");
}
if (StringUtils.isBlank(endTime)) {
return Result.failed("服务计划结束时间不能为空!");
}
try {
srvTaskService.updateSrvTask(taskId, srvEmpId, DateUtils.strToDate(startTime), DateUtils.strToDate(endTime));
} catch (RuntimeException e) {
//修改失败
return Result.failed(e.getMessage());
}
//修改成功
return Result.success();
}
}
governance/src/main/java/com/hungraim/ltc/governance/dao/ChEmpTypeMapper.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.governance.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.serviceManage.ChEmpType;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface ChEmpTypeMapper extends BaseMapper<ChEmpType> {
}
\ No newline at end of file
governance/src/main/java/com/hungraim/ltc/governance/dao/ChSrvProgramMapper.java
View file @ f888d1fa
...@@ -17,12 +17,13 @@ public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> { ...@@ -17,12 +17,13 @@ public interface ChSrvProgramMapper extends BaseMapper<ChSrvProgram> {
/** /**
* 个人照护方案列表查询 * 个人照护方案列表查询
* *
* @param page 分页参数 * @param page 分页参数
* @param disabInfoId 失能人员id * @param disabInfoId 失能人员id
* @param srvOrganId 服务机构id * @param srvOrganId 服务机构id
* @param programStatus 服务方案状态 0：未生效、1：已生效、2：已终止
* @return 返回个人照护方案列表 * @return 返回个人照护方案列表
*/ */
Page<ProgramListVo> getProgramList(Page<ProgramListVo> page, @Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId); Page<ProgramListVo> getProgramList(Page<ProgramListVo> page, @Param("disabInfoId") Long disabInfoId, @Param("srvOrganId") Long srvOrganId, @Param("programStatus") String programStatus);
/** /**
* 查看服务方案详情 * 查看服务方案详情
......
governance/src/main/java/com/hungraim/ltc/governance/dao/SrvTaskMapper.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.governance.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskInfoVO;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
import java.util.List;
@Mapper
@Repository
public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
List<SrvTaskVO> getSrvTaskList(Integer organId, String disableName, String disableTel,
String empName, String certifNum, String startTime, String endTime,
String status, String modeId);
SrvTaskInfoVO getSrvTaskInfo(String taskId);
}
governance/src/main/java/com/hungraim/ltc/governance/service/SrvProgramService.java
View file @ f888d1fa
package com.hungraim.ltc.governance.service; package com.hungraim.ltc.governance.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo; import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
import com.hungraim.ltc.pojo.vo.governance.ProgramListVo; import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo; import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
import java.util.List;
public interface SrvProgramService { public interface SrvProgramService {
/** /**
...@@ -21,12 +24,23 @@ public interface SrvProgramService { ...@@ -21,12 +24,23 @@ public interface SrvProgramService {
/** /**
* 个人照护方案列表查询 * 个人照护方案列表查询
* *
* @param page 分页参数 * @param page 分页参数
* @param disabInfoId 失能人员id * @param disabInfoId 失能人员id
* @param srvOrganId 服务机构id * @param srvOrganId 服务机构id
* @param programStatus 服务方案状态 0：未生效、1：已生效、2：已终止
* @return 返回个人照护方案列表 * @return 返回个人照护方案列表
*/ */
Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId); Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId, String programStatus);
/**
* 个人照护方案记录条数，查询对应方案状态的记录条数
*
* @param disabInfoId 失能人员id
* @param srvOrganId 服务机构id
* @param programStatus 服务方案状态 0：未生效、1：已生效、2：已终止
* @return 返回条数
*/
List<ChSrvProgram> getProgramSetCountByProgStatus(Long disabInfoId, Long srvOrganId, String programStatus);
/** /**
* 查看服务方案详情 * 查看服务方案详情
...@@ -44,4 +58,18 @@ public interface SrvProgramService { ...@@ -44,4 +58,18 @@ public interface SrvProgramService {
* @return 返回添加服务方案需要展示的信息 * @return 返回添加服务方案需要展示的信息
*/ */
ProgramDetailVo getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId); ProgramDetailVo getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId);
/**
* 添加或者修改服务方案
* @param programDetailVo 包装对象
*/
void addProgramAndProgramSetList(ProgramDetailVo programDetailVo);
/**
* 终止服务方案
*
* @param programId 服务方案id
* @param endReason 终止原因
*/
void endProgram(Long programId, String endReason);
} }
governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskService.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.governance.service;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskInfoVO;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* 服务计划Service
*
* @author czz
*/
@Service
public interface SrvTaskService {
List<SrvTaskVO> getSrvTaskList(Integer organId, String disableName, String disableTel,
String empName, String certifNum, String startTime, String endTime,
String status, String modeId);
SrvTaskInfoVO getSrvTaskInfo(String taskId);
void addSrvTask(Long programId, Long srvEmpId, Date startTime, Date endTime);
void updateSrvTask(String taskId, Long srvEmpId, Date startTime, Date endTime);
}
governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvProgramServiceImpl.java
View file @ f888d1fa
package com.hungraim.ltc.governance.service.impl; package com.hungraim.ltc.governance.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.governance.dao.ChSrvProgramMapper; import com.hungraim.ltc.governance.dao.ChSrvProgramMapper;
import com.hungraim.ltc.governance.dao.ChSrvProgramSetMapper;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgramSet;
import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo; import com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo;
import com.hungraim.ltc.pojo.vo.governance.ProgramListVo; import com.hungraim.ltc.pojo.vo.governance.ProgramListVo;
import com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo;
import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo; import com.hungraim.ltc.pojo.vo.governance.SvrSendListVo;
import com.hungraim.ltc.governance.dao.ChSrvSendMapper; import com.hungraim.ltc.governance.dao.ChSrvSendMapper;
import com.hungraim.ltc.governance.service.SrvProgramService; import com.hungraim.ltc.governance.service.SrvProgramService;
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 org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@Service @Service
...@@ -20,14 +29,25 @@ public class SrvProgramServiceImpl implements SrvProgramService { ...@@ -20,14 +29,25 @@ public class SrvProgramServiceImpl implements SrvProgramService {
@Autowired @Autowired
private ChSrvProgramMapper chSrvProgramMapper; private ChSrvProgramMapper chSrvProgramMapper;
@Autowired
private ChSrvProgramSetMapper chSrvProgramSetMapper;
@Override @Override
public Page<SvrSendListVo> getProgramList(Page<SvrSendListVo> page, Long srvOrganId, String realName, String realTel, String programStatus) { public Page<SvrSendListVo> getProgramList(Page<SvrSendListVo> page, Long srvOrganId, String realName, String realTel, String programStatus) {
return chSrvSendMapper.selectSrvSendList(page, srvOrganId, realName, realTel, programStatus); return chSrvSendMapper.selectSrvSendList(page, srvOrganId, realName, realTel, programStatus);
} }
@Override @Override
public Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId) { public Page<ProgramListVo> getProgramSetList(Page<ProgramListVo> page, Long disabInfoId, Long srvOrganId, String programStatus) {
return chSrvProgramMapper.getProgramList(page, disabInfoId, srvOrganId); return chSrvProgramMapper.getProgramList(page, disabInfoId, srvOrganId, programStatus);
}
@Override
public List<ChSrvProgram> getProgramSetCountByProgStatus(Long disabInfoId, Long srvOrganId, String programStatus) {
QueryWrapper<ChSrvProgram> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("DISAB_INFO_ID", disabInfoId).eq("SRV_ORGAN_ID", srvOrganId).ne("PROG_STATUS", programStatus);
List<ChSrvProgram> chSrvPrograms = chSrvProgramMapper.selectList(queryWrapper);
return chSrvPrograms;
} }
@Override @Override
...@@ -39,4 +59,87 @@ public class SrvProgramServiceImpl implements SrvProgramService { ...@@ -39,4 +59,87 @@ public class SrvProgramServiceImpl implements SrvProgramService {
public ProgramDetailVo getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId) { public ProgramDetailVo getProgramDetailWithAdd(Long disabInfoId, Long srvOrganId) {
return chSrvProgramMapper.getProgramDetailWithAdd(disabInfoId, srvOrganId); return chSrvProgramMapper.getProgramDetailWithAdd(disabInfoId, srvOrganId);
} }
@Transactional(rollbackFor = Exception.class)
@Override
public void addProgramAndProgramSetList(ProgramDetailVo programDetailVo) {
Date date = new Date();
Long programId = programDetailVo.getProgramId();
if (null == programId) {
// 添加服务方案操作
// 1.添加服务方案记录
ChSrvProgram chSrvProgram = new ChSrvProgram();
chSrvProgram.setSrvOrganId(programDetailVo.getSrvOrganId());
chSrvProgram.setDisabInfoId(programDetailVo.getDisabInfoId());
chSrvProgram.setSrvModeId(programDetailVo.getSrvModeId());
chSrvProgram.setProgramDate(programDetailVo.getProgramDate());
chSrvProgram.setProgramEdnDate(programDetailVo.getProgramEndDate());
chSrvProgram.setProgStatus(0);
chSrvProgram.setEffTime(date);
chSrvProgramMapper.insert(chSrvProgram);
// 2.使用服务方案记录的id来添加服务方案项目记录
Long newProgramId = chSrvProgram.getProgramId();
List<ProgramSetAndProjectVo> programSetAndProjectVos = programDetailVo.getProgramSetAndProjectVos();
for (ProgramSetAndProjectVo programSetAndProjectVo : programSetAndProjectVos) {
Short isConf = programSetAndProjectVo.getIsConf();
if (isConf.intValue() == 0) {
// 没有配置这条服务方案，直接略过这条记录，无需添加
continue;
}
this.addProgramSet(programDetailVo, date, newProgramId, programSetAndProjectVo);
}
} else {
// 修改操作,修改操作就是对服务方案项目进行修改，两种情况
List<ProgramSetAndProjectVo> programSetAndProjectVos = programDetailVo.getProgramSetAndProjectVos();
for (ProgramSetAndProjectVo programSetAndProjectVo : programSetAndProjectVos) {
Short isConf = programSetAndProjectVo.getIsConf();
if (programSetAndProjectVo.getSetId() != null) {
if (isConf.intValue() == 0) {
// 没有配置这条服务方案，直接删除对应的记录
chSrvProgramSetMapper.deleteById(programSetAndProjectVo.getSetId());
}
// 修改原有的服务方案项目
ChSrvProgramSet chSrvProgramSet = new ChSrvProgramSet();
chSrvProgramSet.setSetId(programSetAndProjectVo.getSetId());
chSrvProgramSet.setPlanningFrequency(programSetAndProjectVo.getPlanningFrequency());
chSrvProgramSet.setPlanningFrequencyType(programSetAndProjectVo.getPlanningFrequencyType());
chSrvProgramSet.setRemark(programSetAndProjectVo.getRemark());
chSrvProgramSetMapper.updateById(chSrvProgramSet);
} else {
if (isConf.intValue() == 0) {
// 没有配置这条服务方案，直接略过这条记录，无需添加
continue;
}
// 新增一条新的服务方案项目
this.addProgramSet(programDetailVo, date, programId, programSetAndProjectVo);
}
}
}
}
@Override
public void endProgram(Long programId, String endReason) {
ChSrvProgram chSrvProgram = new ChSrvProgram();
chSrvProgram.setProgramId(programId);
chSrvProgram.setEndReason(endReason);
chSrvProgram.setProgStatus(2);
chSrvProgramMapper.updateById(chSrvProgram);
}
private void addProgramSet(ProgramDetailVo programDetailVo, Date date, Long newProgramId, ProgramSetAndProjectVo programSetAndProjectVo) {
ChSrvProgramSet chSrvProgramSet = new ChSrvProgramSet();
chSrvProgramSet.setItemId(programSetAndProjectVo.getProjectId());
chSrvProgramSet.setIsConf(programSetAndProjectVo.getIsConf());
chSrvProgramSet.setItemTimes(programSetAndProjectVo.getItemTimes());
chSrvProgramSet.setEffTime(date);
chSrvProgramSet.setProgramId(newProgramId);
chSrvProgramSet.setSrvModeId(programDetailVo.getSrvModeId());
chSrvProgramSet.setItemType(programSetAndProjectVo.getCategoryType());
chSrvProgramSet.setChooseFlag(programSetAndProjectVo.getIsNeed());
chSrvProgramSet.setPlanningFrequency(programSetAndProjectVo.getPlanningFrequency());
chSrvProgramSet.setPlanningFrequencyType(programSetAndProjectVo.getPlanningFrequencyType());
chSrvProgramSet.setRemark(programSetAndProjectVo.getRemark());
chSrvProgramSetMapper.insert(chSrvProgramSet);
}
} }
governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java 0 → 100644
View file @ f888d1fa
package com.hungraim.ltc.governance.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hungraim.ltc.governance.dao.ChSrvTaskDetailMapper;
import com.hungraim.ltc.governance.dao.SrvTaskMapper;
import com.hungraim.ltc.governance.service.SrvTaskService;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTaskDetail;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskInfoVO;
import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
/**
* 服务计划ServiceImpl
*/
@Service
public class SrvTaskServiceImpl implements SrvTaskService {
@Autowired
private SrvTaskMapper srvTaskMapper;
@Autowired
private ChSrvTaskDetailMapper chSrvTaskDetailMapper;
/**
* 服务计划列表
*
* @param organId 护理机构id
* @param disableName 失能人员姓名
* @param disableTel 失能人员手机号码
* @param empName 护理人员姓名
* @param certifNum 护理人员证件号码
* @param startTime 服务计划开始时间
* @param endTime 服务计划结束时间
* @param status 任务状态
* @param modeId 服务方式
*/
@Override
public List<SrvTaskVO> getSrvTaskList(Integer organId, String disableName, String disableTel,
String empName, String certifNum, String startTime, String endTime,
String status, String modeId) {
return srvTaskMapper.getSrvTaskList(organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
}
/**
* 查询服务计划制定详情
*
* @param taskId 服务计划id
*/
@Override
public SrvTaskInfoVO getSrvTaskInfo(String taskId) {
return srvTaskMapper.getSrvTaskInfo(taskId);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void addSrvTask(Long programId, Long srvEmpId, Date startTime, Date endTime) {
try {
//添加服务计划
ChSrvTask chSrvTask = new ChSrvTask();
chSrvTask.setEffTime(new Date());//创建时间
chSrvTask.setProgramId(programId);//服务方案id
chSrvTask.setSrvEmpId(srvEmpId);//服务人员id
chSrvTask.setStatus((short) 0);//状态 未分配：0；已分配：1
int insert = srvTaskMapper.insert(chSrvTask);
if (insert <= 0) {
throw new RuntimeException("添加服务计划失败!");
}
//添加服务计划详情
ChSrvTaskDetail chSrvTaskDetail = new ChSrvTaskDetail();
chSrvTaskDetail.setSrvTaskId(chSrvTask.getSrvTaskId());
chSrvTaskDetail.setSrvStartTime(startTime);//服务开始时间
chSrvTaskDetail.setEndTime(endTime);//服务结束时间
chSrvTaskDetail.setStatus((short) 0);//状态 未执行：0；执行中：1；已执行:2;已失效：3已完成4
int insert1 = chSrvTaskDetailMapper.insert(chSrvTaskDetail);
if (insert1 <= 0) {
throw new RuntimeException("添加服务计划详情失败!");
}
} catch (Exception e) {
throw new RuntimeException("系统繁忙,请稍后再试!");
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void updateSrvTask(String taskId, Long srvEmpId, Date startTime, Date endTime) {
//修改服务计划服务人员
ChSrvTask chSrvTask = srvTaskMapper.selectById(taskId);
if (chSrvTask == null) {
throw new RuntimeException("修改失败,不存在的服务计划!");
}
chSrvTask.setSrvEmpId(srvEmpId);
int i = srvTaskMapper.updateById(chSrvTask);
if (i <= 0) {
throw new RuntimeException("修改服务计划服务人员失败!");
}
//修改服务计划详情计划起止日期
ChSrvTaskDetail chSrvTaskDetail = chSrvTaskDetailMapper.selectOne(new QueryWrapper<ChSrvTaskDetail>().eq("srv_task_id", chSrvTask.getSrvTaskId()));
chSrvTaskDetail.setSrvStartTime(startTime);
chSrvTaskDetail.setEndTime(endTime);
int i1 = chSrvTaskDetailMapper.updateById(chSrvTaskDetail);
if (i1 <= 0) {
throw new RuntimeException("修改服务计划详情计划起止日期失败!");
}
}
}
governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChEmpTypeMapper.xml 0 → 100644
View file @ f888d1fa
<?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.governance.dao.ChEmpTypeMapper">
<resultMap id="BaseResultMap" type="com.hungraim.ltc.pojo.entity.serviceManage.ChEmpType">
<id column="EMP_TYPE" jdbcType="DECIMAL" property="empType" />
<result column="EMP_TYPE_NAME" jdbcType="VARCHAR" property="empTypeName" />
</resultMap>
<sql id="Base_Column_List">
EMP_TYPE, EMP_TYPE_NAME
</sql>
</mapper>
\ No newline at end of file
governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvOrganProjectMapper.xml
View file @ f888d1fa
...@@ -32,18 +32,39 @@ ...@@ -32,18 +32,39 @@
<resultMap id="organProjectsMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo"> <resultMap id="organProjectsMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramSetAndProjectVo">
<id column="PROJECT_ID" property="projectId"/> <id column="PROJECT_ID" property="projectId"/>
<result column="SRV_ORGAN_ID" property="srvOrganId"/> <result column="SRV_ORGAN_ID" property="srvOrganId"/>
<result column="SET_ID" property="setId"/>
<result column="ITEM_NAME" property="itemName"/> <result column="ITEM_NAME" property="itemName"/>
<result column="CATEGORY_TYPE" property="categoryType"/> <result column="CATEGORY_TYPE" property="categoryType"/>
<result column="SRV_ORGAN_ID" property="itemTimes"/> <result column="SRV_ORGAN_ID" property="itemTimes"/>
<result column="ITEM_TIMES_TYPE" property="itemTimesType"/> <result column="ITEM_TIMES_TYPE" property="itemTimesType"/>
<result column="ITEM_PRICE" property="itemPrice"/> <result column="ITEM_PRICE" property="itemPrice"/>
<result column="IS_CONF" property="isNeed"/> <result column="IS_NEED" property="isNeed"/>
<result column="PLANNING_FREQUENCY" property="planningFrequency"/>
<result column="PLANNING_FREQUENCY_TYPE" property="planningFrequencyType"/>
</resultMap> </resultMap>
<select id="selectOrganProjectsBySrvOrganId" resultMap="organProjectsMap"> <select id="selectOrganProjectsBySrvOrganId" resultMap="organProjectsMap">
SELECT * SELECT
PROJECT_ID,
SRV_ORGAN_ID,
ITEM_NAME,
CATEGORY_TYPE,
CH_SRV_ORGAN_PROJECT.ITEM_TIMES,
ITEM_TIMES_TYPE,
CH_SRV_ORGAN_PROJECT.ITEM_PRICE,
CH_SRV_ORGAN_PROJECT.IS_CONF IS_NEED
<if test="programId != null">
,
SET_ID,
PLANNING_FREQUENCY,
PLANNING_FREQUENCY_TYPE,
CH_SRV_PROGRAM_SET.REMARK
</if>
FROM CH_SRV_ORGAN_PROJECT FROM CH_SRV_ORGAN_PROJECT
<if test="programId != null">
LEFT JOIN CH_SRV_PROGRAM_SET ON ITEM_ID = PROJECT_ID AND PROGRAM_ID = #{programId}
</if>
WHERE SRV_ORGAN_ID = #{srvOrganId} WHERE SRV_ORGAN_ID = #{srvOrganId}
AND STATUS = 0 AND STATUS = 0
</select> </select>
</mapper> </mapper>
\ No newline at end of file
governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvProgramMapper.xml
View file @ f888d1fa
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
<resultMap id="ProgramSetDetailVoMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo"> <resultMap id="ProgramSetDetailVoMap" type="com.hungraim.ltc.pojo.vo.governance.ProgramDetailVo">
<id column="PROGRAM_ID" property="programId"/> <result column="PROGRAM_ID" property="programId"/>
<result column="SRV_ORGAN_ID" property="srvOrganId"/> <result column="SRV_ORGAN_ID" property="srvOrganId"/>
<result column="DISAB_INFO_ID" property="disabInfoId"/> <result column="DISAB_INFO_ID" property="disabInfoId"/>
<result column="SRV_MODE_ID" property="srvModeId"/>
<result column="DISTRICT_PROVINCIAL" property="disableDistrictProvincial"/> <result column="DISTRICT_PROVINCIAL" property="disableDistrictProvincial"/>
<result column="DISTRICT_CITY" property="disableDistrictCity"/> <result column="DISTRICT_CITY" property="disableDistrictCity"/>
<result column="DISTRICT_AREA" property="disableDistrictArea"/> <result column="DISTRICT_AREA" property="disableDistrictArea"/>
...@@ -27,15 +28,16 @@ ...@@ -27,15 +28,16 @@
<result column="SRV_MODE_NAME" property="svrModelName"/> <result column="SRV_MODE_NAME" property="svrModelName"/>
<result column="SRV_ORGAN_NAME" property="svrOrganName"/> <result column="SRV_ORGAN_NAME" property="svrOrganName"/>
<result column="PROG_STATUS" property="progStatus"/> <result column="PROG_STATUS" property="progStatus"/>
<result column="program" property="programDate"/>
<result column="PROGRAM_EDN_DATE" property="programEndDate"/> <result column="PROGRAM_EDN_DATE" property="programEndDate"/>
<collection property="programSetAndProjectVos" column="SRV_ORGAN_ID" <result column="PROGRAM_DATE" property="programDate"/>
<collection property="programSetAndProjectVos" column="{srvOrganId=SRV_ORGAN_ID,programId=PROGRAM_ID}"
select="com.hungraim.ltc.governance.dao.ChSrvOrganProjectMapper.selectOrganProjectsBySrvOrganId"/> select="com.hungraim.ltc.governance.dao.ChSrvOrganProjectMapper.selectOrganProjectsBySrvOrganId"/>
</resultMap> </resultMap>
<select id="getProgramDetail" resultMap="ProgramSetDetailVoMap"> <select id="getProgramDetail" resultMap="ProgramSetDetailVoMap">
SELECT T1.PROGRAM_ID, SELECT T1.PROGRAM_ID,
T1.SRV_ORGAN_ID, T1.SRV_ORGAN_ID,
T1.DISAB_INFO_ID, T1.DISAB_INFO_ID,
T1.SRV_MODE_ID,
T2.DISTRICT_PROVINCIAL, T2.DISTRICT_PROVINCIAL,
T2.DISTRICT_CITY, T2.DISTRICT_CITY,
T2.DISTRICT_AREA, T2.DISTRICT_AREA,
...@@ -56,6 +58,8 @@ ...@@ -56,6 +58,8 @@
T7.SRV_MODE_NAME, T7.SRV_MODE_NAME,
T5.SRV_ORGAN_NAME, T5.SRV_ORGAN_NAME,
T1.PROG_STATUS, T1.PROG_STATUS,
T1.PROGRAM_DATE,
T1.PROGRAM_EDN_DATE,
T1.EFF_TIME T1.EFF_TIME
FROM CH_SRV_PROGRAM T1 FROM CH_SRV_PROGRAM T1
INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
...@@ -67,8 +71,10 @@ ...@@ -67,8 +71,10 @@
WHERE T1.PROGRAM_ID = #{programId} WHERE T1.PROGRAM_ID = #{programId}
</select> </select>
<select id="getProgramDetailWithAdd" resultMap="ProgramSetDetailVoMap"> <select id="getProgramDetailWithAdd" resultMap="ProgramSetDetailVoMap">
SELECT T1.SRV_ORGAN_ID, SELECT NULL PROGRAM_ID,
T1.SRV_ORGAN_ID,
T1.DISAB_INFO_ID, T1.DISAB_INFO_ID,
T1.SRV_MODE_ID,
T2.DISTRICT_PROVINCIAL, T2.DISTRICT_PROVINCIAL,
T2.DISTRICT_CITY, T2.DISTRICT_CITY,
T2.DISTRICT_AREA, T2.DISTRICT_AREA,
...@@ -87,7 +93,10 @@ ...@@ -87,7 +93,10 @@
T6.DISABLE_LEVEL_NAME, T6.DISABLE_LEVEL_NAME,
T4.FINISH_TIME, T4.FINISH_TIME,
T7.SRV_MODE_NAME, T7.SRV_MODE_NAME,
T5.SRV_ORGAN_NAME T5.SRV_ORGAN_NAME,
NULL PROG_STATUS,
T1.ALLOT_TIME PROGRAM_DATE,
T1.STOP_TIME PROGRAM_EDN_DATE
FROM CH_SRV_SEND T1 FROM CH_SRV_SEND T1
INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
LEFT JOIN CH_FND_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.SRV_MODE_ID LEFT JOIN CH_FND_SRV_MODE T7 ON T2.SRV_MODE_ID = T7.SRV_MODE_ID
...@@ -129,5 +138,8 @@ ...@@ -129,5 +138,8 @@
LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
WHERE T1.DISAB_INFO_ID = #{disabInfoId} WHERE T1.DISAB_INFO_ID = #{disabInfoId}
AND T1.SRV_ORGAN_ID = #{srvOrganId} AND T1.SRV_ORGAN_ID = #{srvOrganId}
<if test="programStatus != null and programStatus != ''">
T1.PROG_STATUS = #{programStatus}
</if>
</select> </select>
</mapper> </mapper>
\ No newline at end of file
governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml 0 → 100644
View file @ f888d1fa
<?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.governance.dao.SrvTaskMapper">
<!--查询服务分配信息列表-->
<select id="getSrvTaskList" resultType="com.hungraim.ltc.pojo.vo.governance.SrvTaskVO">
select
--服务计划id
task.srv_task_id srvTaskId,
--服务方案id
task.program_id programId,
--失能人员id
disable.disab_info_id disabInfoId,
--所在省市
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.district_provincial = dis.DISTRICT_CODE) districtProvincial,
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.district_city = dis.DISTRICT_CODE) districtCity,
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
--失能人员姓名
disable.real_name realName,
--手机号码
disable.tel tel,
--年龄
disable.birthday birthday,
--性别
disable.gender gender,
--诊断疾病
disable.disease disease,
--失能等级
level1.disable_level_name disableLevelName,
--接受服务地址
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.acpt_srv_provincial = dis.DISTRICT_CODE) districtProvincial,
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.acpt_srv_city = dis.DISTRICT_CODE) districtCity,
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.acpt_srv_area = dis.DISTRICT_CODE) districtArea,
(select STREET_NAME from CH_FND_STREET street where disable.acpt_srv_street = street.STREET_CODE) acptStreet,
--评定等级
report.evaluate_rating_type evaluateRatingType,
--评定完成日期
aprtask.finish_time finishTime,
--服务方式
mode1.srv_mode_name srvModeName,
--护理机构名称
organ.srv_organ_name srvOrganName,
--护理服务人员
emp.emp_name empName,
--任务时间
task.eff_time effTime,
--任务状态(服务计划状态)
task.status status,
--服务方案状态
program.prog_status progStatus,
--服务方案起始日
detail.srv_start_time srvStartTime,
--服务方案终止日
detail.srv_end_time srvEndTime
from ch_srv_task task--服务计划
left join ch_disable_info disable on task.disab_info_id = disable.disab_info_id--失能人员
left join ch_apr_task aprtask on disable.last_task_id = aprtask.task_id--评定任务
left join ch_apr_report report on aprtask.task_id = report.task_id--评定报告
left join ch_srv_program program on task.program_id = program.program_id--服务方案
left join ch_srv_organ organ on program.srv_organ_id = organ.srv_organ_id--服务机构
left join ch_fnd_srv_mode mode1 on program.srv_mode_id = mode1.srv_mode_id--服务方式
left join ch_srv_organ_emp emp on task.srv_emp_id = emp.emp_id--护理人员
left join ch_cfg_srv_disable_level level1 on report.disable_level_id = level1.disable_level_id--失能等级
left join ch_srv_task_detail detail on task.SRV_TASK_ID = detail.TASK_DETAIL_ID--服务任务明细
<where>
<if test="organId != null">
and organ.SRV_ORGAN_ID = #{organId}
</if>
<if test="disableName != null and disableName != ''">
and disable.real_name = #{disableName}
</if>
<if test="disableTel != null and disableTel != ''">
and disable.tel = #{disableTel}
</if>
<if test="empName != null and empName != ''">
and emp.emp_name = #{empName}
</if>
<if test="certifNum != null and certifNum != ''">
and emp.certif_num = #{certifNum}
</if>
<if test="startTime != null and startTime != ''">
and detail.srv_start_time &lt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
and detail.srv_end_time &gt;= #{endTime}
</if>
<if test="status != null and status != ''">
and task.status = #{status}
</if>
<if test="modeId != null and modeId != ''">
and mode1.srv_mode_name = #{modeId}
</if>
</where>
</select>
<!--查询服务计划信息-->
<select id="getSrvTaskInfo" resultType="com.hungraim.ltc.pojo.vo.governance.SrvTaskInfoVO">
select task.srv_task_id srvTaskId,
detail.task_detail_id taskDetailId,
--服务人员姓名
emp.EMP_NAME empName,
--服务人员资质
empType.emp_type_name empTypeName,
--服务方案起始日
detail.srv_start_time srvStartTime,
--服务方案终止日
detail.srv_end_time srvEndTime
from ch_srv_task task--服务计划
left join ch_srv_organ_emp emp on task.srv_emp_id = emp.emp_id--护理人员
left join CH_EMP_TYPE empType on emp.EMP_TYPE_ID = empType.EMP_TYPE--护理人员资质
left join ch_srv_task_detail detail on task.srv_task_id = detail.task_detail_id--服务任务明细
where task.SRV_TASK_ID = #{taskId}
</select>
</mapper>
\ No newline at end of file
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