|
@@ -3,6 +3,7 @@ package thyyxxk.webserver.service.datamodify;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.ibatis.annotations.Param;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import sun.rmi.runtime.Log;
|
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
@@ -30,6 +31,9 @@ import java.util.List;
|
|
|
public class YzActOrderModifyVerifyService {
|
|
|
|
|
|
private final YzActOrderModifyVerifyDao dao;
|
|
|
+ private static final int YZ_SHENHE_TONGGUO = 2 ;
|
|
|
+ private static final int YZ_SHENHE_BOHUI = 3;
|
|
|
+ private static final int YZ_SHENHE_HUICHE = 4;
|
|
|
|
|
|
public YzActOrderModifyVerifyService(YzActOrderModifyVerifyDao dao) {
|
|
|
this.dao = dao;
|
|
@@ -46,14 +50,14 @@ public class YzActOrderModifyVerifyService {
|
|
|
QueryWrapper<TYzActOrderModify> qw = new QueryWrapper<>();
|
|
|
|
|
|
qw.select("inpatient_no,act_order_no,order_name,audit_flag");
|
|
|
- if (param.getActOrderNo() != null ){
|
|
|
+ if (param.getActOrderNo() != null ){
|
|
|
qw.eq("act_order_no",param.getActOrderNo());
|
|
|
}
|
|
|
if (StringUtil.notBlank(param.getInpatientNo())){
|
|
|
qw.eq("inpatient_no",param.getInpatientNo());
|
|
|
}
|
|
|
- if (param.getAuditFlag()==0 ){
|
|
|
- qw.in("audit_flag",1,2,9);
|
|
|
+ if (param.getAuditFlag()==0){
|
|
|
+ qw.in("audit_flag",1,2,3,4);
|
|
|
}else {
|
|
|
qw.eq("audit_flag",param.getAuditFlag());
|
|
|
}
|
|
@@ -61,7 +65,7 @@ public class YzActOrderModifyVerifyService {
|
|
|
if (list.size()>0){
|
|
|
return ResultVoUtil.success(list);
|
|
|
}
|
|
|
- return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST,"暂无修改申请");
|
|
|
+ return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST,"没有找到对应的申请记录 ╮(﹀_﹀”)╭");
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -80,38 +84,51 @@ public class YzActOrderModifyVerifyService {
|
|
|
* */
|
|
|
public TYzActOrderModify yzActOrderQuery(BigDecimal actOrderNo){
|
|
|
QueryWrapper<TYzActOrderModify> qw = new QueryWrapper<>();
|
|
|
- qw.select("act_order_no,inpatient_no,old_start_time,old_end_time,start_time," +
|
|
|
- "end_time,audit_flag,proposer=(select name from a_employee_mi where code=proposer),propose_time," +
|
|
|
+ qw.select("act_order_no,inpatient_no,start_time,end_time,new_start_time," +
|
|
|
+ "new_end_time,audit_flag,proposer=(select name from a_employee_mi where code=proposer),propose_time," +
|
|
|
"audit_staff,audit_time,audit_remark,propose_remark," +
|
|
|
"patient_name,frequ_code,ward_code,order_name");
|
|
|
qw.eq("act_order_no",actOrderNo);
|
|
|
return dao.selectOne(qw);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 审核状态的判断,为2就把 申请的修改数据 通过 并改变申请表中的状态
|
|
|
+ * 为 9 就不通过 只要改变申请表中的状态就可以了
|
|
|
+ * 为 任意数 就直接把 最近一次的 修改 还原就可以了
|
|
|
+ * @param auditFlag 状态 2:通过 9:不通过 任意数为 回撤
|
|
|
+ * @param actOrderNo 医嘱号
|
|
|
+ * @param auditRemark 审核的信息
|
|
|
+ * @return 返回
|
|
|
+ * */
|
|
|
public ResultVo<Boolean> shenHePanDuan(Integer auditFlag,BigDecimal actOrderNo,String auditRemark){
|
|
|
- log.info("医嘱修改审核判断是否通过==>操作人员:{}状态值:{},医嘱号:{}",TokenUtil.getTokenUserId(),auditFlag,actOrderNo);
|
|
|
- if (auditFlag==2){
|
|
|
- //查询 要修改的 字段
|
|
|
- TYzActOrderModify pojo = yzActOrderQuery(actOrderNo);
|
|
|
- //修改医嘱
|
|
|
+ //根据医嘱号 在申请表中 获取数据
|
|
|
+ TYzActOrderModify pojo = yzActOrderQuery(actOrderNo);
|
|
|
+ if (auditFlag==YZ_SHENHE_TONGGUO){
|
|
|
+ log.info("医嘱修改审核审核通过");
|
|
|
+ //改变医嘱 数据
|
|
|
if (dao.yzActOrderModify(pojo)){
|
|
|
- log.info("修改成功==>医嘱修改前==》修改人:{},开始时间:{},结束时间:{}",
|
|
|
- TokenUtil.getTokenUserId(),pojo.getOldStartTime(),pojo.getOldEndTime());
|
|
|
- log.info("修改成功==>医嘱修改前==》修改人:{},开始时间:{},结束时间:{}",
|
|
|
- TokenUtil.getTokenUserId(),pojo.getStartTime(),pojo.getEndTime());
|
|
|
- //医嘱修改成功后 要 修改申请的状态
|
|
|
- if (dao.shenHeZhuangTaiGaiBian(auditFlag,TokenUtil.getTokenUserId(),actOrderNo,auditRemark)){
|
|
|
- log.info("申请状态更新");
|
|
|
- return ResultVoUtil.success();
|
|
|
- }
|
|
|
- }else{
|
|
|
- log.info("修改失败:{}", JSON.toJSONString(pojo));
|
|
|
+ //改变状态
|
|
|
+ if (dao.shenHeZhuangTaiGaiBian(auditFlag,TokenUtil.getTokenUserId(),actOrderNo,auditRemark)){
|
|
|
+ log.info("医嘱修改成功原数据===>审核人:{},开始时间:{},结束时间:{}",
|
|
|
+ TokenUtil.getTokenUserId(),pojo.getStartTime(),pojo.getEndTime());
|
|
|
+ log.info("医嘱修改成功修改后===>审核人:{},开始时间:{},结束时间:{}",
|
|
|
+ TokenUtil.getTokenUserId(),pojo.getNewStartTime(),pojo.getNewEndTime());
|
|
|
+ }
|
|
|
}
|
|
|
- }else if(auditFlag==9){
|
|
|
+ }else if (auditFlag==YZ_SHENHE_BOHUI){
|
|
|
dao.shenHeZhuangTaiGaiBian(auditFlag,TokenUtil.getTokenUserId(),actOrderNo,auditRemark);
|
|
|
- System.out.println("不通过");
|
|
|
- }else {
|
|
|
- System.out.println("回撤");
|
|
|
+ log.info("驳回成功",auditFlag);
|
|
|
+ }else if (auditFlag==YZ_SHENHE_HUICHE){
|
|
|
+ TYzActOrderModify param = new TYzActOrderModify();
|
|
|
+ param.setStartTime(pojo.getStartTime());
|
|
|
+ param.setEndTime(pojo.getEndTime());
|
|
|
+ param.setActOrderNo(pojo.getActOrderNo());
|
|
|
+ if (dao.yzHuiChe(param)){
|
|
|
+ if (dao.shenHeZhuangTaiGaiBian(auditFlag,TokenUtil.getTokenUserId(),actOrderNo,auditRemark)){
|
|
|
+ log.info("数据回撤成功");
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return ResultVoUtil.success();
|
|
|
}
|