优化查询和检验检查时间

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

@@ -184,7 +184,8 @@ public interface CaoYaoYiZhuDao {
                               @Param("orderNo") BigDecimal orderNo);
 
 
-    @Insert("insert into yz_act_order (act_order_no, inpatient_no, admiss_times, order_code/*77592*/, order_time, frequ_code/*once*/, " +
+    @Insert("insert into yz_act_order (act_order_no, inpatient_no, admiss_times, order_code , order_time," +
+            " frequ_code , " +
             "                          enter_time, " +
             "                          enter_oper, start_time, infant_flag, drug_flag,  " +
             "                          physician, confirm_time, signer, status_flag, " +

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

@@ -287,7 +287,7 @@ public interface JianYanJianChaDao {
             "insert into ysh_yj_req (req_no, inpatient_no, p_name, p_age, admiss_times, bed_no, group_name/* order_name一样*/, " +
             "                        act_order_no, order_code, order_name, page_no/* req_no */, req_comment, req_doctor, " +
             "                        req_dept, req_ward, exec_dept, req_date,/*getdate*/ " +
-            "                        receive_flag/*1*/, req_type/*2检验3检查*/, sys_date/*getdate*/, start_time/*用户选择的*/, diag_code, " +
+            "                        receive_flag/*1*/, req_type/*2检验3检查*/, sys_date/*getdate*/, start_time , diag_code, " +
             "                        diag_text, " +
             "                        order_type, jz_flag/*1 和 null*/, req_tz_comment/*体征信息*/, req_other_result/*相关辅检结果*/," +
             "inspect_stuff) " +
@@ -295,7 +295,7 @@ public interface JianYanJianChaDao {
             "<foreach collection='list' item='item' separator=','>" +
             "(#{item.reqNo}, #{inpatientNo}, #{name}, #{age}, #{admissTimes}, #{bedNo}, #{item.orderName}, " +
             "        #{item.actOrderNo}, #{item.orderCode}, cast(#{item.orderName} as varchar(60)) , #{item.reqNo}, #{item.reqComment}, #{userCode}, " +
-            "        #{deptCode}, #{wardCode}, #{item.execDept}, #{reqDate}, '1', #{reqType}, #{reqDate}, #{item.startTime},#{item.diagCode},#{item.diagText}, " +
+            "        #{deptCode}, #{wardCode}, #{item.execDept}, #{reqDate}, '1', #{reqType}, #{reqDate}, #{reqDate},#{item.diagCode},#{item.diagText}, " +
             "        (select class from ${orderTypeTable} where zy_order_code = #{item.orderCode})," +
             "       #{item.jzFlag},#{item.reqTzComment},#{item.reqOtherResult}," +
             "       #{item.inspectStuff})" +
@@ -322,7 +322,7 @@ 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}, #{reqDate}, #{userCode}, #{reqDate}, " +
+            "(#{item.orderCode}, #{item.orderName}, 'ONCE', #{infantFlag}, #{item.startTime}, #{userCode}, #{item.startTime}, " +
             "        #{item.actOrderNo}, #{inpatientNo}, " +
             "        #{admissTimes}, 'o', #{userCode}, #{reqDate}, '2', #{reqDate}, #{userCode}, '0', '0', '00', '00', '1', " +
             "        #{item.execDept}, " +

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

@@ -1458,4 +1458,7 @@ public interface YiZhuLuRuDao {
     void updateOrderInstruction(@Param("order") BigDecimal order,
                                 @Param("str") String str);
 
+    @Select("select count(1) from yz_order_frequency where code = #{code}")
+    int getTheFrequency(@Param("code") String code);
+
 }

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/XinZhenYiZhu.java

@@ -132,7 +132,6 @@ public class XinZhenYiZhu {
      */
     private List<BigDecimal> associatedGroup;
 
-
     @NotNull(message = "上传数据不能为空")
     private List<XinZhenYzActOrder> list;
 }

src/main/java/thyyxxk/webserver/service/inpatient/XiangMuLuRuService.java

@@ -95,7 +95,7 @@ public class XiangMuLuRuService {
 
         if (param.getFeiYongLeiXingCode() == 0) {
             // 查询项目
-            qw.eq("serial", "00");
+            qw.eq("isnull(nullif(rtrim(serial), ''), '00')", "00");
             if (param.getTotal() == 0) {
                 page.setTotal(dao.huanZheFeiYongToatalV2(qw));
             }

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

@@ -433,7 +433,7 @@ public class JianYanJianChaShenQingService {
             if (item.getStartTime() == null) {
                 cuoWuXinXi.append(baoCunCuoWuXinXi(index, "检查时间不能为空"));
             } else if (DateUtil.shiJianDaXiao(huanZheXinXi.getAdmissDate(), item.getStartTime(), ">")) {
-                cuoWuXinXi.append(baoCunCuoWuXinXi(index, "检查时间不能在入院时间之前。"));
+                cuoWuXinXi.append(baoCunCuoWuXinXi(index, "医嘱时间不能小于入院时间"));
             }
             if (StringUtil.isBlank(item.getExecDept())) {
                 cuoWuXinXi.append(baoCunCuoWuXinXi(index, "执行科室不能为空。"));

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

@@ -243,7 +243,7 @@ public class YiZhuLuRuServer {
      * @param param 数据
      * @return 返回提示
      */
-    public ResultVo<Map<String, Object>> confirmOrders(@NotNull XinZhenYiZhu param) {
+    public ResultVo<Map<String, Object>> confirmOrders(XinZhenYiZhu param) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("a.inpatient_no", param.getInpatientNo())
                 .eq("a.admiss_times", param.getAdmissTimes())

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/yizhuverify/YiZhuCheckData.java

@@ -110,8 +110,9 @@ public class YiZhuCheckData {
 
         if (StringUtil.isBlank(item.getFrequCode())) {
             errorMessage.add("频次不能为空");
+        } else if (dao.getTheFrequency(item.getFrequCode()) == 0) {
+            errorMessage.add("该执行频率已被停用，请更改，不然会导致无法执行。");
         }
-
     }
 
     private void itemCheck(XinZhenYzActOrder item) {