Commit 10f135d6 authored by liuxun's avatar liuxun

merge

parent 3d807dbc
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.riskLevel.ChDisableRiskLevel;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 失能人员风险等级表 Mapper 接口
* </p>
*
* @author dzh
* @since 2022-03-01
*/
@Mapper
public interface ChDisableRiskLevelMapper extends BaseMapper<ChDisableRiskLevel> {
}
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvempRiskLevel;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 护理人员风险等级表 Mapper 接口
* </p>
*
* @author dzh
* @since 2022-03-01
*/
@Mapper
public interface ChSrvempRiskLevelMapper extends BaseMapper<ChSrvempRiskLevel> {
}
package com.hungraim.ltc.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvorganRiskLevel;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 护理机构风险等级表 Mapper 接口
* </p>
*
* @author dzh
* @since 2022-03-01
*/
@Mapper
public interface ChSrvorganRiskLevelMapper extends BaseMapper<ChSrvorganRiskLevel> {
}
...@@ -12,6 +12,8 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach; ...@@ -12,6 +12,8 @@ import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.assessment.ChAprTask; import com.hungraim.ltc.pojo.entity.assessment.ChAprTask;
import com.hungraim.ltc.pojo.entity.assessment.ChDisableInfoHis; import com.hungraim.ltc.pojo.entity.assessment.ChDisableInfoHis;
import com.hungraim.ltc.pojo.entity.disable.*; import com.hungraim.ltc.pojo.entity.disable.*;
import com.hungraim.ltc.pojo.entity.riskLevel.ChDisableRiskLevel;
import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvorganRiskLevel;
import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara; import com.hungraim.ltc.pojo.entity.serviceManage.ChCfgPara;
import com.hungraim.ltc.pojo.vo.disable.*; import com.hungraim.ltc.pojo.vo.disable.*;
import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo; import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
...@@ -24,6 +26,7 @@ import lombok.AllArgsConstructor; ...@@ -24,6 +26,7 @@ import lombok.AllArgsConstructor;
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.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -50,6 +53,9 @@ public class DisableServiceImpl implements DisableService { ...@@ -50,6 +53,9 @@ public class DisableServiceImpl implements DisableService {
private final DisableInfoHisMapper disableInfoHisMapper; private final DisableInfoHisMapper disableInfoHisMapper;
private final OrganService organService; private final OrganService organService;
@Autowired
private ChDisableRiskLevelMapper chDisableRiskLevelMapper;
/** /**
* 获取机构ids * 获取机构ids
* *
...@@ -250,6 +256,13 @@ public class DisableServiceImpl implements DisableService { ...@@ -250,6 +256,13 @@ public class DisableServiceImpl implements DisableService {
chAprTask.setAprType(0);//申请:0;复评:1 chAprTask.setAprType(0);//申请:0;复评:1
chAprTask.setTaskStatus(0); // 任务状态 0 未分配 chAprTask.setTaskStatus(0); // 任务状态 0 未分配
aprTaskMapper.insert(chAprTask); aprTaskMapper.insert(chAprTask);
ChDisableRiskLevel chDisableRiskLevel = new ChDisableRiskLevel();
chDisableRiskLevel.setRiskLevel(0L);
chDisableRiskLevel.setDisabInfoId(Long.valueOf(chDisableInfo.getDisabInfoId()));
chDisableRiskLevel.setStatus(0);
chDisableRiskLevel.setFcd(new Date());
chDisableRiskLevelMapper.insert(chDisableRiskLevel);
} }
} }
...@@ -492,4 +505,4 @@ public class DisableServiceImpl implements DisableService { ...@@ -492,4 +505,4 @@ public class DisableServiceImpl implements DisableService {
return disableUpdateDetailVO; return disableUpdateDetailVO;
} }
} }
\ No newline at end of file
...@@ -3,11 +3,14 @@ package com.hungraim.ltc.service.impl; ...@@ -3,11 +3,14 @@ package com.hungraim.ltc.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.api.AttachFeignService; import com.hungraim.ltc.api.AttachFeignService;
import com.hungraim.ltc.dao.ChSrvOrganEmpMapper; import com.hungraim.ltc.dao.ChSrvOrganEmpMapper;
import com.hungraim.ltc.dao.ChSrvempRiskLevelMapper;
import com.hungraim.ltc.dao.SrvEmpTypeMapper; import com.hungraim.ltc.dao.SrvEmpTypeMapper;
import com.hungraim.ltc.dao.SrvOrganMapper; import com.hungraim.ltc.dao.SrvOrganMapper;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach; import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpType; import com.hungraim.ltc.pojo.entity.disable.ChCfgSrvEmpType;
import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan; import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvempRiskLevel;
import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvorganRiskLevel;
import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganEmp; import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvOrganEmp;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo; import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpListVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo; import com.hungraim.ltc.pojo.vo.disable.SrvOrganEmpVo;
...@@ -20,6 +23,7 @@ import com.hungraim.ltc.util.ResultCode; ...@@ -20,6 +23,7 @@ import com.hungraim.ltc.util.ResultCode;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -41,6 +45,9 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService { ...@@ -41,6 +45,9 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
private final SrvOrganMapper srvOrganMapper; private final SrvOrganMapper srvOrganMapper;
@Autowired
private ChSrvempRiskLevelMapper chSrvempRiskLevelMapper;
@Override @Override
public Page<SrvOrganEmpListVo> getSrvOrganEmpListVo(Page<SrvOrganEmpListVo> page, Long organId, Boolean isInvolveChild, String empName, String srvOrganName, String certifNum, Short isLock, Short empType) { public Page<SrvOrganEmpListVo> getSrvOrganEmpListVo(Page<SrvOrganEmpListVo> page, Long organId, Boolean isInvolveChild, String empName, String srvOrganName, String certifNum, Short isLock, Short empType) {
List<Long> organIds = organService.getOrganIds(organId, isInvolveChild); List<Long> organIds = organService.getOrganIds(organId, isInvolveChild);
...@@ -91,6 +98,14 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService { ...@@ -91,6 +98,14 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
chSrvOrganEmp.setIsLock((short) 0); chSrvOrganEmp.setIsLock((short) 0);
chSrvOrganEmpMapper.insert(chSrvOrganEmp); chSrvOrganEmpMapper.insert(chSrvOrganEmp);
updateAttachs(srvOrganEmpVo, chSrvOrganEmp.getEmpId()); updateAttachs(srvOrganEmpVo, chSrvOrganEmp.getEmpId());
ChSrvempRiskLevel chSrvempRiskLevel = new ChSrvempRiskLevel();
chSrvempRiskLevel.setRiskLevel(0L);
chSrvempRiskLevel.setSrvEmpId(Long.valueOf(chSrvOrganEmp.getEmpId()));
chSrvempRiskLevel.setStatus(0);
chSrvempRiskLevel.setFcd(new Date());
chSrvempRiskLevelMapper.insert(chSrvempRiskLevel);
} else { } else {
// 修改 // 修改
chSrvOrganEmpMapper.updateById(chSrvOrganEmp); chSrvOrganEmpMapper.updateById(chSrvOrganEmp);
......
...@@ -3,14 +3,12 @@ package com.hungraim.ltc.service.impl; ...@@ -3,14 +3,12 @@ package com.hungraim.ltc.service.impl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.hungraim.ltc.api.AttachFeignService; import com.hungraim.ltc.api.AttachFeignService;
import com.hungraim.ltc.dao.ChCfgSrvOrganTypeMapper; import com.hungraim.ltc.dao.*;
import com.hungraim.ltc.dao.ChFndSrvOrganLevelMapper;
import com.hungraim.ltc.dao.SrvModeMapper;
import com.hungraim.ltc.dao.SrvOrganMapper;
import com.hungraim.ltc.pojo.entity.SysConfig.ChCfgSrvOrganType; import com.hungraim.ltc.pojo.entity.SysConfig.ChCfgSrvOrganType;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach; import com.hungraim.ltc.pojo.entity.SysConfig.ChFndAttach;
import com.hungraim.ltc.pojo.entity.SysConfig.ChFndSrvOrganLevel; import com.hungraim.ltc.pojo.entity.SysConfig.ChFndSrvOrganLevel;
import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan; import com.hungraim.ltc.pojo.entity.disable.ChSrvOrgan;
import com.hungraim.ltc.pojo.entity.riskLevel.ChSrvorganRiskLevel;
import com.hungraim.ltc.pojo.vo.disable.SrvModeVo; import com.hungraim.ltc.pojo.vo.disable.SrvModeVo;
import com.hungraim.ltc.pojo.vo.disable.SrvOrganListVo; import com.hungraim.ltc.pojo.vo.disable.SrvOrganListVo;
import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo; import com.hungraim.ltc.pojo.vo.system.AttachUpdateVo;
...@@ -23,6 +21,7 @@ import com.hungraim.ltc.util.ResultCode; ...@@ -23,6 +21,7 @@ import com.hungraim.ltc.util.ResultCode;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -47,6 +46,9 @@ public class SrvOrganServiceImpl implements SrvOrganService { ...@@ -47,6 +46,9 @@ public class SrvOrganServiceImpl implements SrvOrganService {
private final AttachFeignService attachFeignService; private final AttachFeignService attachFeignService;
@Autowired
private ChSrvorganRiskLevelMapper chSrvorganRiskLevelMapper;
@Override @Override
public Page<SrvOrganListVo> getSrvOrganList(Page<SrvOrganListVo> page, Long organId, Boolean isInvolveChild, String creditCode, String srvOrganName) { public Page<SrvOrganListVo> getSrvOrganList(Page<SrvOrganListVo> page, Long organId, Boolean isInvolveChild, String creditCode, String srvOrganName) {
...@@ -112,6 +114,12 @@ public class SrvOrganServiceImpl implements SrvOrganService { ...@@ -112,6 +114,12 @@ public class SrvOrganServiceImpl implements SrvOrganService {
if (!StrUtil.equals(attachs.getCode(), ResultCode.SUCCESS.getCode())) { if (!StrUtil.equals(attachs.getCode(), ResultCode.SUCCESS.getCode())) {
log.error("同步修改文件数据失败,失败原因:{}", attachs.getMsg()); log.error("同步修改文件数据失败,失败原因:{}", attachs.getMsg());
} }
ChSrvorganRiskLevel chSrvorganRiskLevel = new ChSrvorganRiskLevel();
chSrvorganRiskLevel.setRiskLevel(0L);
chSrvorganRiskLevel.setSrvOrganId(Long.valueOf(chSrvOrgan.getSrvOrganId()));
chSrvorganRiskLevel.setStatus(0);
chSrvorganRiskLevel.setFcd(new Date());
chSrvorganRiskLevelMapper.insert(chSrvorganRiskLevel);
} }
} }
......
<?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.ChDisableRiskLevelMapper">
</mapper>
<?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.ChSrvempRiskLevelMapper">
</mapper>
<?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.ChSrvorganRiskLevelMapper">
</mapper>
package com.hungraim.ltc.pojo.entity.riskLevel;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 失能人员风险等级表
* </p>
*
* @author dzh
* @since 2022-03-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("CH_DISABLE_RISK_LEVEL")
public class ChDisableRiskLevel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "DISA_RISK_LEVEL_ID", type = IdType.AUTO)
private Long disaRiskLevelId;
/**
* 失能人员ID
*/
@TableField("DISAB_INFO_ID")
private Long disabInfoId;
/**
* 失能人员可疑任务数量(近30天)
*/
@TableField("DISAB_SUSP_COU")
private Long disabSuspCou;
/**
* 失能人员任务数量(近30天)
*/
@TableField("DISAB_SUM_COU")
private Long disabSumCou;
/**
* 风险等级百分比
*/
@TableField("RISK_LEVEL_PERCENT")
private String riskLevelPercent;
/**
* 风险等级(0低风险,1中风险,2高风险,3无任务)
*/
@TableField("RISK_LEVEL")
private Long riskLevel;
/**
* 状态(0有效,1失效)
*/
@TableField("STATUS")
private Integer status;
/**
* 备注
*/
@TableField("REMARK")
private String remark;
/**
* 首次操作时间
*/
@TableField("FCD")
private Date fcd;
/**
* 首次操作人
*/
@TableField("FCU")
private Long fcu;
/**
* 末次操作时间
*/
@TableField("LCD")
private Date lcd;
/**
* 末次操作人
*/
@TableField("LCU")
private Long lcu;
}
package com.hungraim.ltc.pojo.entity.riskLevel;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 护理人员风险等级表
* </p>
*
* @author dzh
* @since 2022-03-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("CH_SRVEMP_RISK_LEVEL")
public class ChSrvempRiskLevel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "SRVEMP_RISK_LEVEL_ID", type = IdType.AUTO)
private Long srvempRiskLevelId;
/**
* 护理人员ID
*/
@TableField("SRV_EMP_ID")
private Long srvEmpId;
/**
* 护理人员可疑任务数量(近30天)
*/
@TableField("SRV_SUSP_COU")
private Long srvSuspCou;
/**
* 护理人员任务数量(近30天)
*/
@TableField("SRV_SUM_COU")
private Long srvSumCou;
/**
* 风险等级百分比
*/
@TableField("RISK_LEVEL_PERCENT")
private String riskLevelPercent;
/**
* 风险等级(0低风险,1中风险,2高风险,3无任务)
*/
@TableField("RISK_LEVEL")
private Long riskLevel;
/**
* 状态(0有效,1失效)
*/
@TableField("STATUS")
private Integer status;
/**
* 备注
*/
@TableField("REMARK")
private String remark;
/**
* 首次操作时间
*/
@TableField("FCD")
private Date fcd;
/**
* 首次操作人
*/
@TableField("FCU")
private Long fcu;
/**
* 末次操作时间
*/
@TableField("LCD")
private Date lcd;
/**
* 末次操作人
*/
@TableField("LCU")
private Long lcu;
/**
* 月度平均护理人数
*/
@TableField("MONTH_DISA_COU")
private Long monthDisaCou;
}
package com.hungraim.ltc.pojo.entity.riskLevel;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 护理机构风险等级表
* </p>
*
* @author dzh
* @since 2022-03-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("CH_SRVORGAN_RISK_LEVEL")
public class ChSrvorganRiskLevel implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键ID
*/
@TableId(value = "SRVORGAN_RISK_LEVEL_ID", type = IdType.AUTO)
private Long srvorganRiskLevelId;
/**
* 护理机构ID
*/
@TableField("SRV_ORGAN_ID")
private Long srvOrganId;
/**
* 护理机构可疑任务数量(近30天)
*/
@TableField("SRVORG_SUSP_COU")
private Long srvorgSuspCou;
/**
* 护理机构任务数量(近30天)
*/
@TableField("SRVORG_SUM_COU")
private Long srvorgSumCou;
/**
* 风险等级百分比
*/
@TableField("RISK_LEVEL_PERCENT")
private String riskLevelPercent;
/**
* 风险等级(0低风险,1中风险,2高风险,3无任务)
*/
@TableField("RISK_LEVEL")
private Long riskLevel;
/**
* 状态(0有效,1失效)
*/
@TableField("STATUS")
private Integer status;
/**
* 备注
*/
@TableField("REMARK")
private String remark;
/**
* 首次操作时间
*/
@TableField("FCD")
private Date fcd;
/**
* 首次操作人
*/
@TableField("FCU")
private Long fcu;
/**
* 末次操作时间
*/
@TableField("LCD")
private Date lcd;
/**
* 末次操作人
*/
@TableField("LCU")
private Long lcu;
}
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