医嘱修改

src/main/java/thyyxxk/webserver/controller/datamodify/YzActOrderModifyController.java

@@ -2,12 +2,12 @@ package thyyxxk.webserver.controller.datamodify;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
+import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
 import thyyxxk.webserver.service.datamodify.YzActOrderModifyService;
 
+import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @description医嘱修改 前端控制器
@@ -20,7 +20,7 @@ public class YzActOrderModifyController {
 
    private final YzActOrderModifyService server;
 
-    @Autowired
+   @Autowired
    public YzActOrderModifyController(YzActOrderModifyService server){
         this.server = server;
    }
@@ -31,19 +31,21 @@ public class YzActOrderModifyController {
     }
 
     @GetMapping("/queryYzDetails")
-    public ResultVo<YzActOrder> queryYzDetails(@RequestParam("actOrderNo") float actOrderNo) {
+    public ResultVo<YzActOrder> queryYzDetails(@RequestParam("actOrderNo") BigDecimal actOrderNo) {
         return server.queryYzDetails(actOrderNo);
     }
 
-    @PostMapping("/update")
-    public ResultVo<Boolean> update(@RequestBody YzActOrder param){
-        return server.update(param);
-    }
 
-    @GetMapping("/getDropdownBox")
-    public ResultVo<Map<String, List<GetDropdownBox>>> getDropdownBox(){
-        return server.getDropdownBox();
-    }
+
+   @PostMapping("/yzModifyApply")
+    public ResultVo<Boolean> yzModifyApply(@RequestBody TYzActOrderModify param){
+        return server.yzModifyApply(param);
+   }
+
+   @GetMapping("/chaKanZhuangTai")
+    public ResultVo<List<TYzActOrderModify>> chaKanZhuangTai(@RequestParam("inpatientNo") String inpatientNo){
+        return server.chaKanZhuangTai(inpatientNo);
+   }
 
 }
 

src/main/java/thyyxxk/webserver/controller/datamodify/YzActOrderModifyVerifyController.java

@@ -0,0 +1,46 @@
+package thyyxxk.webserver.controller.datamodify;
+
+import org.springframework.web.bind.annotation.*;
+import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
+import thyyxxk.webserver.service.datamodify.YzActOrderModifyVerifyService;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 描述
+ * </p>
+ *
+ * @author xc
+ * @date 2021-04-09 08:38
+ */
+@RestController
+@RequestMapping("/yzActOrderModifyVerify")
+public class YzActOrderModifyVerifyController {
+
+    private final YzActOrderModifyVerifyService service;
+
+
+    public YzActOrderModifyVerifyController(YzActOrderModifyVerifyService service) {
+        this.service = service;
+    }
+
+    @PostMapping("/chaKanZhuangTai")
+    public ResultVo<List<TYzActOrderModify>> chaKanZhuangTai(@RequestBody TYzActOrderModify param){
+        return service.chaKanZhuangTai(param);
+    }
+
+    @GetMapping("/shenHeXinXi")
+    public ResultVo<TYzActOrderModify> shenHeXinXi(@RequestParam("actOrderNo")BigDecimal actOrderNo){
+        return service.shenHeXinXi(actOrderNo);
+    }
+
+    @GetMapping("/shenHePanDuan")
+    public ResultVo<Boolean> shenHePanDuan(@RequestParam("auditFlag")Integer auditFlag,
+                                           @RequestParam("actOrderNo")BigDecimal actOrderNo,
+                                           @RequestParam("auditRemark") String auditRemark){
+        return service.shenHePanDuan(auditFlag,actOrderNo,auditRemark);
+    }
+}

src/main/java/thyyxxk/webserver/dao/his/datamodify/YzActOrderMapper.java

@@ -3,15 +3,11 @@ package thyyxxk.webserver.dao.his.datamodify;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
+import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
-import thyyxxk.webserver.entity.querydata.CovidVaccinateAppointment;
+import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
 
-import java.util.ArrayList;
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -31,14 +27,13 @@ public interface YzActOrderMapper extends BaseMapper<YzActOrder> {
      * @param id 医嘱号
      * @return 返回指定数据
      * */
-    @Select("select act_order_no,rtrim((select name from a_employee_mi where code = physician)) physician_name,physician ,exec_unit, " +
-            "order_name,drug_specification,rtrim(frequ_code) frequ_code,supply_code, " +
-            "start_time,modifier, " +
-            "rtrim((select name from a_employee_mi where code = modifier)) modifier_name,modifier, " +
-            "end_time,order_time,parent_no,discription,instruction " +
-            "from  yz_act_order a " +
-            "where  act_order_no = #{id}")
-    YzActOrder query(@Param("id") float id);
+    @Select("select rtrim(a.inpatient_no) inpatient_no,rtrim(frequ_code) frequ_code,start_time,end_time,act_order_no," +
+            "order_name,rtrim(b.name) patient_name," +
+            "admiss_times,order_code,order_time,enter_time,performance_time, " +
+            "rtrim((select name from zy_ward_code where code = ward_code)) ward_code from " +
+            "yz_act_order as a,a_patient_mi as b " +
+            "where a.inpatient_no=b.inpatient_no and act_order_no =#{id} and isnull(del_flag,0)=0")
+    YzActOrder query(@Param("id") BigDecimal id);
 
     /**
      * 查询全部医嘱
@@ -48,36 +43,38 @@ public interface YzActOrderMapper extends BaseMapper<YzActOrder> {
     @Select("select act_order_no,order_name,status_flag from yz_act_order ${ew.customSqlSegment}")
     List<YzActOrder> listQueryYz(@Param(Constants.WRAPPER) Wrapper<YzActOrder> queryWrapper);
 
-    /**
-     * 修改医嘱的一些字段
-     * @param yzActOrder 里面传入需要字段和条件
-     * @return 返回
-     * */
-    @Update("update yz_act_order set frequ_code=#{frequCode}, supply_code=#{supplyCode},start_time=#{startTime}, " +
-            "end_time=#{endTime},physician = #{physician},exec_unit=#{execUnit}, " +
-            "instruction=#{instruction},modifier=#{modifier},order_time=#{orderTime} " +
-            "where act_order_no = #{actOrderNo}")
-    boolean yzUpdate(YzActOrder yzActOrder);
+
 
     /**
-     * 获取频次
-     * @return 返回
+     * 申请医嘱修改
+     * @param param 要插入的数据 医嘱号，住院号，原本的开始时间，原本的结束时间，
+     * 新的开始时间，新的结束时间，审核状态默认为 1，申请人，申请时间，申请备注，频次，病房，医嘱名称
+     * @return 返回状态
      * */
-    @Select("select rtrim(code) code,rtrim(code) name from yz_order_frequency where isnull(del_flag,0) =0")
-    ArrayList<GetDropdownBox> getFreQuCode();
+    @Insert("insert into t_yz_act_order_modify(act_order_no, inpatient_no, old_start_time, old_end_time, " +
+            "start_time, end_time, audit_flag, proposer, propose_time, propose_remark,patient_name, " +
+            "frequ_code, ward_code, order_name)  " +
+            "values (#{actOrderNo},#{inpatientNo},#{oldStartTime},#{oldEndTime}, " +
+            "#{startTime},#{endTime},1,#{proposer},getdate(),#{proposeRemark}, " +
+            "#{patientName},#{frequCode},#{wardCode},#{orderName})")
+    boolean yzActOrderModifyInsert(TYzActOrderModify param);
 
     /**
-     * 获取给药方式
-     * @return 返回
+     * 如果数据库中有了的话就更新
+     * @param param 要更新的字段
+     * @return 状态
      * */
-    @Select("select code,rtrim(name) name from view_zd_supply_type")
-    ArrayList<GetDropdownBox> getSupplyType();
+    @Update("update t_yz_act_order_modify set old_start_time=#{oldStartTime},old_end_time=#{oldEndTime}," +
+            "start_time=#{startTime},end_time=#{endTime},audit_flag=1,proposer=#{proposer},propose_time=getdate(),propose_remark=#{proposeRemark}")
+    boolean yzActOrderModifyUpdate(TYzActOrderModify param);
 
     /**
-     * 获取科室
-     * @return 返回
+     * 如果已经申请过了就不能插入了 还有给页面返回状态
+     * @param queryWrapper mybatis-plus的构造器 用来动态插入条件语句
+     * @return 返回act_order_no
      * */
-    @Select("select code,name from zd_unit_code where isnull(del_flag,0) =0")
-    ArrayList<GetDropdownBox> getUnitCode();
+    @Select("select act_order_no,audit_flag,audit_remark,propose_remark from t_yz_act_order_modify  ${ew.customSqlSegment}")
+    List<TYzActOrderModify> queryZhuangTai(@Param(Constants.WRAPPER) Wrapper<TYzActOrderModify> queryWrapper);
+
 
 }

src/main/java/thyyxxk/webserver/dao/his/datamodify/YzActOrderModifyVerifyDao.java

@@ -0,0 +1,44 @@
+package thyyxxk.webserver.dao.his.datamodify;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 描述
+ * </p>
+ *
+ * @author xc
+ * @date 2021-04-09 08:40
+ */
+@Mapper
+public interface YzActOrderModifyVerifyDao extends BaseMapper<TYzActOrderModify> {
+
+    /**
+     * 修改医嘱的开始时间和结束时间
+     * @param param  传入开始时间 和 结束时间 以及 医嘱号
+     * @return 返回成功和失败
+     * */
+    @Update("update yz_act_order set start_time=#{startTime},end_time=#{endTime} where act_order_no=#{actOrderNo}")
+    Boolean yzActOrderModify(TYzActOrderModify param);
+
+    /**
+     * 更新状态
+     * @param actOrderNo 医嘱号 根据医嘱号来更新
+     * @param auditFlag = 1-未审核；2-审核通过；9-审核不通过；
+     * @param auditStaff 审核人员
+     * @return 返回是否成功
+     * */
+    @Update("update t_yz_act_order_modify set " +
+            "audit_flag=#{auditFlag},audit_staff=#{auditStaff},audit_time=getdate(),audit_remark=#{auditRemark} where act_order_no=#{actOrderNo}")
+    Boolean shenHeZhuangTaiGaiBian(@Param("auditFlag")int auditFlag,
+                                   @Param("auditStaff")String auditStaff,
+                                   @Param("actOrderNo")BigDecimal actOrderNo,
+                                   @Param("auditRemark")String auditRemark);
+}

src/main/java/thyyxxk/webserver/entity/datamodify/TYzActOrderModify.java

@@ -0,0 +1,108 @@
+package thyyxxk.webserver.entity.datamodify;
+
+import java.io.Serializable;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author 肖
+ */
+@Data
+public class TYzActOrderModify implements Serializable {
+
+	private static final long serialVersionUID =  8374839975562338818L;
+
+	/**
+	 * 自增id
+	 */
+	private Integer id;
+
+	/**
+	 * 医嘱号
+	 */
+	private BigDecimal actOrderNo;
+
+	/**
+	 * 住院号
+	 */
+	private String inpatientNo;
+
+	/**
+	 * 老的开始时间
+	 */
+	private Date oldStartTime;
+
+	/**
+	 * 老的结束时间
+	 */
+	private Date oldEndTime;
+
+	/**
+	 * 要修改的开始时间
+	 */
+	private Date startTime;
+
+	/**
+	 * 要修改的结束时间
+	 */
+	private Date endTime;
+
+	/**
+	 * 审核状态：1-未审核；2-审核通过；9-审核不通过；
+	 */
+	private Integer auditFlag;
+
+	/**
+	 * 医嘱修改申请人
+	 */
+	private String proposer;
+
+	/**
+	 * 医嘱修改申请时间
+	 */
+	private Date proposeTime;
+
+	/**
+	 * 审核人
+	 */
+	private String auditStaff;
+
+	/**
+	 * 审核时间
+	 */
+	private Date auditTime;
+
+	/**
+	 * 审核备注
+	 */
+	private String auditRemark;
+
+	/**
+	 * 医嘱修改申请备注
+	 */
+	private String proposeRemark;
+
+	/**
+	 * 患者的姓名
+	 */
+	private String patientName;
+
+	/**
+	 * 频次
+	 */
+	private String frequCode;
+
+
+	/**
+	 * 病房
+	 */
+	private String wardCode;
+
+	/**
+	 * 医嘱名称
+	 */
+	private String orderName;
+
+}

src/main/java/thyyxxk/webserver/entity/datamodify/YzActOrder.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,10 +28,15 @@ public class YzActOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "act_order_no", type = IdType.ID_WORKER)
-    private Float actOrderNo;
+    private BigDecimal actOrderNo;
 
     private String inpatientNo;
 
+    /**
+     * 病人的姓名
+     * */
+    private String patientName;
+
 
     private Integer admissTimes;
 

src/main/java/thyyxxk/webserver/service/datamodify/YzActOrderModifyService.java

@@ -1,22 +1,21 @@
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
-import thyyxxk.webserver.constants.Capacity;
 import thyyxxk.webserver.dao.his.datamodify.YzActOrderMapper;
 import thyyxxk.webserver.entity.ResultVo;
-import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
+import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
 import thyyxxk.webserver.entity.datamodify.YzActOrder;
 import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
-import java.util.HashMap;
+import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -30,6 +29,7 @@ import java.util.Map;
 @Slf4j
 public class YzActOrderModifyService {
     private final YzActOrderMapper dao;
+    private static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
 
     @Autowired
     public YzActOrderModifyService(YzActOrderMapper dao) {
@@ -43,6 +43,7 @@ public class YzActOrderModifyService {
      * */
     public ResultVo<List<YzActOrder>> queryYz(YzActOrder param){
         QueryWrapper<YzActOrder> qw = new QueryWrapper<>();
+        log.info("通过住院号或者医嘱号查询==》医嘱号：{}，住院号：{}",param.getActOrderNo(),param.getInpatientNo());
         if (param.getActOrderNo()!=null){
            qw.eq("act_order_no",param.getActOrderNo());
         }
@@ -59,54 +60,52 @@ public class YzActOrderModifyService {
      * @param actOrderNo 医嘱号
      * @return 指定数据
      * */
-    public ResultVo<YzActOrder> queryYzDetails(float actOrderNo){
+    public ResultVo<YzActOrder> queryYzDetails(BigDecimal actOrderNo){
         return ResultVoUtil.success(dao.query(actOrderNo));
     }
 
     /**
-     * 修改医嘱字段  医嘱号，频次，给药方式，开始时间，停止时间，医嘱时间，医生，执行科室，医生嘱托，签字医生
-     * @param param 传入需要修改的指定字段
-     * @return 返回
+     * 提交医嘱修改申请
+     * @param param 提交申请的信息
+     * @return 返回提示
      * */
-    static final String PATTERN = "yyyy-MM-dd HH:mm:ss";
-    public ResultVo<Boolean> update(YzActOrder param) {
-        YzActOrder yz = dao.query(param.getActOrderNo());
-        log.info("医嘱修改前==>修改人:{}，医嘱号：{}，频次:{}，给药方式:{}，开始时间:{}，停止时间:{}，医嘱时间:{}，医生:{}，执行科室:{}，医生嘱托:{}，签字医生:{}",
-                TokenUtil.getTokenUserId(),
-                yz.getActOrderNo(),
-                yz.getFrequCode(),
-                yz.getSupplyCode(),
-                yz.getStartTime()!=null? DateUtil.formatDatetime(yz.getStartTime(),PATTERN):"null",
-                yz.getEndTime()!=null? DateUtil.formatDatetime(yz.getEndTime(),PATTERN): "null",
-                yz.getOrderTime()!=null? DateUtil.formatDatetime(yz.getOrderTime(),PATTERN): "null",
-                yz.getPhysician(),
-                yz.getExecUnit(),
-                yz.getInstruction(),
-                yz.getModifier());
-        log.info("医嘱修改后==>修改人:{}，医嘱号：{}，频次:{}，给药方式:{}，开始时间:{}，停止时间:{}，医嘱时间:{}，医生:{}，执行科室:{}，医生嘱托:{}，签字医生:{}",
-                TokenUtil.getTokenUserId(),
-                param.getActOrderNo(),
-                param.getFrequCode(),
-                param.getSupplyCode(),
-                param.getStartTime()!=null? DateUtil.formatDatetime(param.getStartTime(),PATTERN):"null",
-                param.getEndTime()!=null ?  DateUtil.formatDatetime(param.getEndTime(),PATTERN): "null",
-                param.getOrderTime()!=null? DateUtil.formatDatetime(param.getOrderTime(),PATTERN):"null",
-                param.getPhysician(),
-                param.getExecUnit(),
-                param.getInstruction(),
-                param.getModifier());
-        return ResultVoUtil.success(dao.yzUpdate(param));
+    public ResultVo<Boolean> yzModifyApply(TYzActOrderModify param){
+        YzActOrder pojo = dao.query(param.getActOrderNo());
+        log.info("提交医嘱修改申请修改前数据==》：提交人：{}，修改医嘱号：{}，开始时间：{}，结束时间{}",
+                TokenUtil.getTokenUserId(),pojo.getActOrderNo(),
+                pojo.getStartTime()!=null? DateUtil.formatDatetime(pojo.getStartTime(),PATTERN):null,
+                pojo.getEndTime()!=null? DateUtil.formatDatetime(pojo.getEndTime(),PATTERN):null);
+        log.info("提交医嘱修改申请修改后数据==》：提交人：{}，修改医嘱号：{}，开始时间：{}，结束时间{}",
+                TokenUtil.getTokenUserId(),param.getActOrderNo(),
+                param.getStartTime()!=null? DateUtil.formatDatetime(param.getStartTime(),PATTERN):null,
+                param.getEndTime()!=null? DateUtil.formatDatetime(param.getEndTime(),PATTERN):null);
+        param.setOldStartTime(pojo.getStartTime());
+        param.setOldEndTime(pojo.getEndTime());
+        param.setProposer(TokenUtil.getTokenUserId());
+
+        //通过医嘱号来查询 在医嘱修改表中是否有重复的数据
+        QueryWrapper<TYzActOrderModify> qw = new QueryWrapper<>();
+        qw.eq("act_order_no",param.getActOrderNo());
+        if (dao.queryZhuangTai(qw).size()>0){
+            dao.yzActOrderModifyUpdate(param);
+            log.info("医嘱修改申请已存在执行更新操作:{}",JSON.toJSONString(param));
+        }else{
+            log.info("医嘱修改申请插入数据：{}", JSON.toJSONString(param));
+            dao.yzActOrderModifyInsert(param);
+        }
+        return ResultVoUtil.success();
     }
 
     /**
-     * 获取 频次、给药方式、执行科室的 code 和 name 给到页面中选择
-     * @return 返回map 集合
+     * 查看审核的状态 有多个医嘱要查看的
+     * @param inpatientNo 住院号
+     * @return 返回状态
      * */
-    public ResultVo<Map<String,List<GetDropdownBox>>> getDropdownBox(){
-        Map<String, List<GetDropdownBox>> map = new HashMap<>(Capacity.TWO);
-        map.put("freQuCode",dao.getFreQuCode());
-        map.put("unitCode",dao.getUnitCode());
-        map.put("supplyCode",dao.getSupplyType());
-        return ResultVoUtil.success(map);
+    public ResultVo<List<TYzActOrderModify>> chaKanZhuangTai(String inpatientNo){
+        log.info("根据住院号查询状态：{}",inpatientNo);
+        QueryWrapper<TYzActOrderModify> qw = new QueryWrapper<>();
+        qw.eq("inpatient_no", inpatientNo);
+        return ResultVoUtil.success(dao.queryZhuangTai(qw));
     }
+
 }

src/main/java/thyyxxk/webserver/service/datamodify/YzActOrderModifyVerifyService.java

@@ -0,0 +1,118 @@
+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.springframework.stereotype.Service;
+import sun.rmi.runtime.Log;
+import thyyxxk.webserver.config.exception.ExceptionEnum;
+import thyyxxk.webserver.dao.his.datamodify.YzActOrderModifyVerifyDao;
+import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
+import thyyxxk.webserver.entity.datamodify.YzActOrder;
+import thyyxxk.webserver.utils.ResultVoUtil;
+import thyyxxk.webserver.utils.StringUtil;
+import thyyxxk.webserver.utils.TokenUtil;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * 描述
+ * </p>
+ *
+ * @author xc
+ * @date 2021-04-09 08:40
+ */
+@Service
+@Slf4j
+public class YzActOrderModifyVerifyService {
+
+    private final YzActOrderModifyVerifyDao dao;
+
+    public YzActOrderModifyVerifyService(YzActOrderModifyVerifyDao dao) {
+        this.dao = dao;
+    }
+
+    /**
+     * 根据医嘱号或者住院号 还有审核的状态来获取 需要审核的信息
+     * @param param 查询的条件
+     * @return 返回审核的信息
+     * */
+    public ResultVo<List<TYzActOrderModify>> chaKanZhuangTai(TYzActOrderModify param){
+        log.info("查询医嘱审核状态==》操作员：{}，医嘱号：{}，住院号：{}，状态值：{}",
+                TokenUtil.getTokenUserId(),param.getActOrderNo(),param.getInpatientNo(),param.getAuditFlag());
+        QueryWrapper<TYzActOrderModify> qw = new QueryWrapper<>();
+
+        qw.select("inpatient_no,act_order_no,order_name,audit_flag");
+        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);
+        }else {
+            qw.eq("audit_flag",param.getAuditFlag());
+        }
+        List<TYzActOrderModify> list = dao.selectList(qw);
+        if (list.size()>0){
+            return ResultVoUtil.success(list);
+        }
+        return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST,"暂无修改申请");
+    }
+
+    /**
+     * 根据医嘱号来获取一些详细的信息
+     * @param actOrderNo 医嘱号
+     * @return 返回指定的
+     * */
+    public ResultVo<TYzActOrderModify> shenHeXinXi(BigDecimal actOrderNo){
+        return ResultVoUtil.success(yzActOrderQuery(actOrderNo));
+    }
+
+    /**
+     * 把通过医嘱号查询的封装起来 别的地方还要用
+     * @param actOrderNo 医嘱号
+     * @return 返回对应的数据
+     * */
+    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," +
+                "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);
+    }
+
+    public ResultVo<Boolean> shenHePanDuan(Integer auditFlag,BigDecimal actOrderNo,String auditRemark){
+    log.info("医嘱修改审核判断是否通过==>操作人员：{}状态值：{}，医嘱号：{}",TokenUtil.getTokenUserId(),auditFlag,actOrderNo);
+        if (auditFlag==2){
+            //查询 要修改的 字段
+            TYzActOrderModify pojo = yzActOrderQuery(actOrderNo);
+            //修改医嘱
+            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));
+            }
+        }else if(auditFlag==9){
+            dao.shenHeZhuangTaiGaiBian(auditFlag,TokenUtil.getTokenUserId(),actOrderNo,auditRemark);
+            System.out.println("不通过");
+        }else {
+            System.out.println("回撤");
+        }
+        return ResultVoUtil.success();
+    }
+}

src/test/java/thyyxxk/webserver/WebServerApplicationTests.java

@@ -3,17 +3,24 @@ package thyyxxk.webserver;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import thyyxxk.webserver.service.datamodify.ZyChargeFeeModifyService;
+import thyyxxk.webserver.entity.ResultVo;
+import thyyxxk.webserver.entity.datamodify.TYzActOrderModify;
+import thyyxxk.webserver.service.datamodify.YzActOrderModifyVerifyService;
+
+import java.util.List;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class WebServerApplicationTests {
     @Autowired
-    private ZyChargeFeeModifyService zy;
+    private YzActOrderModifyVerifyService service;
 
 
     @Test
     void contextLoads() {
-
+        TYzActOrderModify pojo = new TYzActOrderModify();
+        pojo.setAuditFlag(0);
+        ResultVo<List<TYzActOrderModify>>  list = service.chaKanZhuangTai(pojo);
+        list.getData().forEach(System.out::println);
     }
 
 }