修改

src/main/java/thyyxxk/webserver/dao_his/yzactorder/YzActOrderMapper.java

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import thyyxxk.webserver.pojo.yzActOrder.YzActOrder;
 
+import java.util.Date;
+
 
 /**
  * <p>
@@ -23,10 +25,10 @@ public interface YzActOrderMapper {
             "from yz_act_order as a\n" +
             "inner join a_employee_mi as b on (a.physician=b.code)\n" +
             "inner join zd_unit_code as c on (a.exec_unit = c.code)\n" +
-            "where act_order_no = #{data}")
-    YzActOrder query(@Param("data") float data);
+            "where act_order_no = #{id}")
+    YzActOrder query(@Param("id") float id);
 
     @Update("update yz_act_order set end_time = #{date} where act_order_no = #{id}")
-    boolean upendTime(@Param("date") String date,@Param("id")float id);
+    boolean upendTime(@Param("date") Date date, @Param("id")float id);
 
 }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -36,24 +37,20 @@ public class YzActOrder implements Serializable {
 
     private String orderCode;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String orderTime;
+    private Date orderTime;
 
     private String frequCode;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String enterTime;
+    private Date enterTime;
 
     private String enterOper;
 
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String startTime;
+    //老的 结束时间
+    private Date oldenterTime;
 
+    private Date startTime;
 
-    private String endTime;
+    private Date endTime;
 
     private String infantFlag;
 
@@ -61,11 +58,11 @@ public class YzActOrder implements Serializable {
 
     private String supplyCode;
 
-    private String performanceTime;
+    private Date performanceTime;
 
     private String physician;
 
-    private String confirmTime;
+    private Date confirmTime;
 
     private String signer;
 
@@ -73,7 +70,7 @@ public class YzActOrder implements Serializable {
 
     private String statusFlag;
 
-    private String statusTime;
+    private Date statusTime;
 
     private Float drugQuan;
 
@@ -113,7 +110,7 @@ public class YzActOrder implements Serializable {
 
     private String printInfusion;
 
-    private String excluBackTime;
+    private Date excluBackTime;
 
     private Float excluActOrderNo;
 
@@ -151,7 +148,7 @@ public class YzActOrder implements Serializable {
 
     private String msgFlag;
 
-    private String execTime;
+    private Date execTime;
 
     private String execId;
 
@@ -159,7 +156,7 @@ public class YzActOrder implements Serializable {
 
     private String psOper;
 
-    private String psTime;
+    private Date psTime;
 
     private String execId2;
 
@@ -179,7 +176,7 @@ public class YzActOrder implements Serializable {
 
     private String chargeStatus;
 
-    private String psResultTime;
+    private Date psResultTime;
 
     private String kfFlag;
 

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

@@ -9,6 +9,7 @@ import thyyxxk.webserver.dao_his.yzactorder.YzActOrderMapper;
 import thyyxxk.webserver.pojo.ResultVo;
 import thyyxxk.webserver.pojo.yzActOrder.YzActOrder;
 import thyyxxk.webserver.utils.ResultVoUtil;
+import thyyxxk.webserver.utils.TokenUtil;
 
 import javax.xml.ws.Response;
 
@@ -34,7 +35,7 @@ public class YzActOrderService  {
     public ResultVo<YzActOrder>  query(float data){
         YzActOrder yzActOrder = dao.query(data);
         if (yzActOrder!=null){
-            log.info("查询医嘱号："+data);
+            log.info("查询医嘱号=>{}",data);
             return ResultVoUtil.success(yzActOrder);
         }else {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
@@ -42,8 +43,9 @@ public class YzActOrderService  {
     }
 
     public ResultVo<Boolean> upendTime(YzActOrder data) {
-        log.info("修改日期为:" + data.getEndTime() + "医嘱号:" + data.getActOrderNo());
-        boolean fa = dao.upendTime(data.getEndTime(), data.getActOrderNo());
-        return ResultVoUtil.success(fa);
+        log.info("更改医嘱时间 => 操作员：{} ，修改前：{}，修改后：{}，修改的医嘱号: {}"
+                ,TokenUtil.getTokenUserId(),data.getOldenterTime(),
+                data.getEndTime(),data.getActOrderNo());
+        return ResultVoUtil.success(dao.upendTime(data.getEndTime(), data.getActOrderNo()));
     }
 }