修改医嘱

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

@@ -5,6 +5,8 @@ import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.datamodify.YzActOrder;
 import thyyxxk.webserver.service.datamodify.YzActOrderService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -29,9 +31,14 @@ public class YzActOrderController {
         return yz.query(actOrderNo);
     }
 
-    @PostMapping("/upendTime")
-    public ResultVo<Boolean> upendTime(@RequestBody YzActOrder data){
-        return yz.upendTime(data);
+    @PostMapping("/update")
+    public ResultVo<Boolean> update(@RequestBody YzActOrder data){
+        return yz.update(data);
+    }
+
+    @GetMapping("/getDropdownBox")
+    public ResultVo<Map<String,Object>> getDropdownBox(){
+        return yz.getDropdownBox();
     }
 
 }

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

@@ -1,11 +1,15 @@
 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.pojo.datamodify.GetDropdownBox;
 import thyyxxk.webserver.pojo.datamodify.YzActOrder;
 
+import java.util.ArrayList;
+
 
 /**
  * <p>
@@ -16,18 +20,32 @@ import thyyxxk.webserver.pojo.datamodify.YzActOrder;
  * @since 2021-03-08
  */
 @Mapper
-public interface YzActOrderMapper {
-    @Select("select act_order_no,physician = b.name ,exec_unit = c.name\n" +
-            ",order_name,drug_specification,frequ_code,supply_code,start_time,modifier,\n" +
-            "modifier_name=(select name from a_employee_mi where code = modifier)\n" +
-            ",end_time,order_time,parent_no,discription,instruction\n" +
+public interface YzActOrderMapper extends BaseMapper<YzActOrder> {
+    @Select("select act_order_no,rtrim((select name from a_employee_mi where code = physician)) physician_name,physician ,exec_unit,\n" +
+            "order_name,drug_specification,rtrim(frequ_code) frequ_code,supply_code,\n" +
+            "start_time,modifier,\n" +
+            "rtrim((select name from a_employee_mi where code = modifier)) modifier_name,modifier,\n" +
+            "end_time,order_time,parent_no,discription,instruction\n" +
             "from  yz_act_order a\n" +
-            "inner join a_employee_mi b on (a.physician = b.code)\n" +
-            "inner join zd_unit_code c on (a.exec_unit = c.code)\n" +
             "where  act_order_no = #{id}")
     YzActOrder query(@Param("id") float id);
 
-    @Update("update yz_act_order set end_time = #{endTime},modifier = #{modifier} where act_order_no = #{actOrderNo}")
-    boolean yzUpdate(YzActOrder yzActOrder);
+    @Update("update yz_act_order set frequ_code=#{frequCode}, supply_code=#{supplyCode},start_time=#{startTime},\n" +
+            "end_time=#{endTime},physician = #{physician},exec_unit=#{execUnit},\n" +
+            "instruction=#{instruction},modifier=#{modifier},order_time=#{orderTime}\n" +
+            "where act_order_no = #{actOrderNo}")
+    boolean update(YzActOrder yzActOrder);
+
+    //获取频次
+    @Select("select rtrim(code) code,rtrim(code) name from yz_order_frequency where isnull(del_flag,0) =0")
+    ArrayList<GetDropdownBox> getFrequCode();
+
+    //获取给药方式
+    @Select("select code,rtrim(name) name from view_zd_supply_type")
+    ArrayList<GetDropdownBox> getSupplyType();
+
+    //获取科室
+    @Select("select code,name from zd_unit_code where isnull(del_flag,0) =0")
+    ArrayList<GetDropdownBox> getUnitCode();
 
 }

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

@@ -22,29 +22,6 @@ import java.util.List;
 @Mapper
 public interface ZyDetailChargeMapper   {
 
-    @Select("select admiss_times,ledger_sn,detail_sn,charge_date,inpatient_no,\n" +
-            "case when (a.serial=01) then '药品(小)' when (a.serial=99) then '药品(大)' else '项目' end as serial,\n" +
-            "op_id_code=(select name from a_employee_mi where code=op_id_code),\n" +
-            "case when (infant_flag=0) then '否' else '是' end as  infant_flag,\n" +
-            "case when (charge_status=1) then '录入' when (charge_status=2) then '上账' else '结算' end as charge_status,\n" +
-            "case when ((select name from zd_charge_item where  code = charge_code_mx) is null) then (b.name)\n" +
-            "else (select name from zd_charge_item where  code = charge_code_mx )\n" +
-            "end as charge_code,\n" +
-            "charge_fee,\n" +
-            "case when (a.self_flag=0) then '否' else '是' end as self_flag,\n" +
-            "ward_code=(select name from zd_unit_code where code = ward_code),\n" +
-            "dept_code=(select name from zd_unit_code where code = dept_code),\n" +
-            "order_no,ope_flag,\n" +
-            "exec_unit=(select name from zd_unit_code where code=exec_unit),\n" +
-            "gen_time,a.charge_code_mx,charge_amount\n" +
-            "from zy_detail_charge as a\n" +
-            "inner join yp_zd_dict as b on (a.charge_code_mx = code and a.serial = b.serial)\n" +
-            "where inpatient_no=#{inpatientNo} and charge_code_mx=#{chargeCodeMx} and\n" +
-            "admiss_times=(select admiss_times from zy_actpatient where inpatient_no=a.inpatient_no)\n" +
-            "and ledger_sn=(select max(ledger_sn) from zy_ledger_file where inpatient_no=a.inpatient_no and admiss_times=a.admiss_times)")
-    List<ZyDetailCharge> queryTotal(@Param("inpatientNo")String inpatientNo,@Param("chargeCodeMx")String chargeCodeMx);
-
-
     @Update("update zy_detail_charge set charge_fee = #{newChargeFee}\n" +
             "where inpatient_no=#{inpatientNo} and detail_sn=#{detailSn} " +
             "and admiss_times=#{admissTimes} and ledger_sn=#{ledgerSn} ")

src/main/java/thyyxxk/webserver/pojo/datamodify/GetDropdownBox.java

@@ -0,0 +1,9 @@
+package thyyxxk.webserver.pojo.datamodify;
+
+import lombok.Data;
+
+@Data
+public class GetDropdownBox {
+    private String code;
+    private String name;
+}

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

@@ -49,29 +49,30 @@ public class YzActOrder implements Serializable {
     private Date oldendTime;
 
     private Date endTime;
-    //老的签字医生
-    private String oldModifier;
+
 
     private String modifier;
 
+    private String modifierName;
+
     private String infantFlag;
 
     private String drugFlag;
 
     private String supplyCode;
 
+    private String supplyCodeName;
+
     private Date performanceTime;
 
     private String physician;
 
+    private String physicianName;
+
     private Date confirmTime;
 
     private String signer;
 
-
-
-    private String modifierName;
-
     private String statusFlag;
 
     private Date statusTime;

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

@@ -11,6 +11,9 @@ import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -39,20 +42,44 @@ public class YzActOrderService  {
         }
     }
 
-    public ResultVo<Boolean> upendTime(YzActOrder data) {
-        if(!data.getOldendTime().equals(data.getEndTime())){
-            log.info("更改医嘱时间 => 操作员：{} ，修改前：{}，修改后：{}，修改的医嘱号: {}"
-                    ,TokenUtil.getTokenUserId(),
-                    DateUtil.formatDatetime(data.getOldendTime(),"yyyy-MM-dd HH:mm:ss"),
-                    DateUtil.formatDatetime(data.getEndTime(),"yyyy-MM-dd HH:mm:ss"),
-                    data.getActOrderNo());
-        }
+    public ResultVo<Boolean> update(YzActOrder data) {
 
-        if(!data.getOldModifier().equals(data.getModifier())){
-            log.info("修改医生签字 => 操作员：{} ，修改前：{}，修改后：{}，修改的医嘱号: {}"
-                    ,TokenUtil.getTokenUserId(),data.getOldModifier(),
-                    data.getModifier(),data.getActOrderNo());
-        }
-        return ResultVoUtil.success(dao.yzUpdate(data));
+        String pattern = "yyyy-MM-dd HH:mm:ss";
+        YzActOrder yz = dao.query(data.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(),
+                data.getActOrderNo(),
+                data.getFrequCode(),
+                data.getSupplyCode(),
+                data.getStartTime()!=null? DateUtil.formatDatetime(data.getStartTime(),pattern):"null",
+                data.getEndTime()!=null ?  DateUtil.formatDatetime(data.getEndTime(),pattern): "null",
+                data.getOrderTime()!=null? DateUtil.formatDatetime(data.getOrderTime(),pattern):"null",
+                data.getPhysician(),
+                data.getExecUnit(),
+                data.getInstruction(),
+                data.getModifier());
+
+        dao.update(data);
+        return ResultVoUtil.success();
+    }
+
+    public ResultVo<Map<String,Object>> getDropdownBox(){
+        Map map = new HashMap();
+        map.put("frequCode",dao.getFrequCode());
+        map.put("unitCode",dao.getUnitCode());
+        map.put("supplyCode",dao.getSupplyType());
+        return ResultVoUtil.success(map);
     }
 }