申请时间和医嘱的时间一致

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -11,6 +11,7 @@ import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.*;
 import thyyxxk.webserver.entity.zhuyuanyisheng.yizhuluru.PatientTemp;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -331,7 +332,7 @@ public interface JianYanJianChaDao {
             "<foreach collection='list' item='item' separator=','>" +
             "(#{item.reqNo}, #{inpatientNo}, #{name}, #{age}, #{admissTimes}, #{bedNo}, #{item.orderName}, " +
             "        #{item.actOrderNo}, #{item.orderCode}, #{item.orderName}, #{item.reqNo}, #{item.reqComment}, #{userCode}, " +
-            "        #{deptCode}, #{wardCode}, #{item.execDept}, getdate(), '1', #{reqType}, getdate(), #{item.startTime},#{item.diagCode},#{item.diagText}, " +
+            "        #{deptCode}, #{wardCode}, #{item.execDept}, #{reqDate}, '1', #{reqType}, #{reqDate}, #{item.startTime},#{item.diagCode},#{item.diagText}, " +
             "        (select class from ${orderTypeTable} where zy_order_code = #{item.orderCode})," +
             "       #{item.jzFlag},#{item.reqTzComment},#{item.reqOtherResult}," +
             "       #{item.inspectStuff})" +
@@ -347,7 +348,8 @@ public interface JianYanJianChaDao {
                        @Param("deptCode") String deptCode,
                        @Param("wardCode") String wardCode,
                        @Param("reqType") String reqType,
-                       @Param("orderTypeTable") String orderTypeTable);
+                       @Param("orderTypeTable") String orderTypeTable,
+                       @Param("reqDate") Date reqDate);
 
     @Insert("<script>" +
             "INSERT INTO yz_act_order (order_code, order_name, frequ_code, infant_flag/*婴儿标志*/, order_time, physician, start_time, " +
@@ -357,9 +359,9 @@ public interface JianYanJianChaDao {
             "                          ward_code, reg_flag/*1*/,emergency_flag,yb_self_flag) " +
             "VALUES " +
             "<foreach collection='list' item='item' separator=','>" +
-            "(#{item.orderCode}, #{item.orderName}, 'ONCE', #{infantFlag}, getdate(), #{userCode}, getdate(), " +
+            "(#{item.orderCode}, #{item.orderName}, 'ONCE', #{infantFlag}, #{reqDate}, #{userCode}, #{reqDate}, " +
             "        #{item.actOrderNo}, #{inpatientNo}, " +
-            "        #{admissTimes}, 'o', #{userCode}, getdate(), '2', getdate(), #{userCode}, '0', '0', '00', '00', '1', " +
+            "        #{admissTimes}, 'o', #{userCode}, #{reqDate}, '2', #{reqDate}, #{userCode}, '0', '0', '00', '00', '1', " +
             "        #{item.execDept}, " +
             "        #{deptCode}, #{wardCode}, '1',#{item.jzFlag},#{item.ybSelfFlag})" +
             "</foreach>" +
@@ -370,7 +372,8 @@ public interface JianYanJianChaDao {
                             @Param("userCode") String userCode,
                             @Param("deptCode") String deptCode,
                             @Param("wardCode") String wardCode,
-                            @Param("infantFlag") Integer infantFlag);
+                            @Param("infantFlag") Integer infantFlag,
+                            @Param("reqDate") Date reqDate);
 
 
     @Select("<script>" +

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingService.java

@@ -27,10 +27,8 @@ import thyyxxk.webserver.service.redislike.RedisLikeService;
 import thyyxxk.webserver.utils.*;
 
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.nio.channels.NonWritableChannelException;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -469,11 +467,13 @@ public class JianYanJianChaShenQingService {
 
     @Transactional(rollbackFor = Exception.class)
     public void insertData(TianJiaJianChaJianYan param, XinZhenYiZhu huanZheXinXi, String userCode) {
+        Date reqDate = new Date();
         dao.chaRuShenQing(param.getList(), param.getInpatientNo(), param.getName(), param.getAge() + "岁", param.getAdmissTimes(),
                 param.getBedNo(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getReqType(),
-                "3".equals(param.getReqType()) ? "jc_zd_item" : "jy_zd_item");
+                "3".equals(param.getReqType()) ? "jc_zd_item" : "jy_zd_item", reqDate);
+
         dao.chaRuShenQingYiZhu(param.getList(), param.getInpatientNo(), param.getAdmissTimes(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(),
-                PublicServer.getInfantFlag(param.getInpatientNo()));
+                PublicServer.getInfantFlag(param.getInpatientNo()), reqDate);
     }