Sfoglia il codice sorgente

暂时环节一下检验检查的保存,因为还有通知的问题

xiaochan 1 mese fa
parent
commit
416793f717

+ 2 - 1
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -318,7 +318,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', #{item.reqType}, #{reqDate}, #{reqDate},#{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}, #{item.inspectPart},#{item.quantity},#{item.chargeFee})" +
@@ -333,6 +333,7 @@ public interface JianYanJianChaDao {
                        @Param("userCode") String userCode,
                        @Param("deptCode") String deptCode,
                        @Param("wardCode") String wardCode,
+                       @Param("reqType") String reqType,
                        @Param("orderTypeTable") String orderTypeTable,
                        @Param("reqDate") Date reqDate);
 

+ 5 - 5
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingService.java

@@ -471,12 +471,9 @@ public class JianYanJianChaShenQingService {
         Map<String, Integer> itemCount = new HashMap<>();
 
         for (YshYjReq item : param.getList()) {
-            boolean isCheck = item.getReqType() != null && item.getReqType().trim().equals(JC_TYPE);
+            boolean isCheck = JC_TYPE.equals(param.getReqType());
             item.setForeachIndex(index);
-
-            if (StrUtil.isBlank(item.getReqType())) {
-                cuoWuXinXi.append(baoCunCuoWuXinXi(index, "项目类型不能为空,请刷新页面。"));
-            }
+            item.setReqType(param.getReqType());
 
             if (item.getQuantity() == null) {
                 item.setQuantity(BigDecimal.ONE);
@@ -515,6 +512,7 @@ public class JianYanJianChaShenQingService {
                 if (StringUtil.isBlank(item.getDiagCode())) {
                     cuoWuXinXi.append(baoCunCuoWuXinXi(index, "临床诊断不能为空。"));
                 }
+
             } else {
                 if (StringUtil.isBlank(item.getInspectStuff())) {
                     cuoWuXinXi.append(baoCunCuoWuXinXi(index, "标本不能为空。"));
@@ -706,8 +704,10 @@ public class JianYanJianChaShenQingService {
                 param.getAdmissTimes(),
                 param.getBedNo(),
                 userCode,
+                // 这里是坑爹的反过来的
                 patInfo.getWardCode(),
                 patInfo.getDeptCode(),
+                param.getReqType(),
                 JC_TYPE.equals(param.getReqType()) ? "jc_zd_item" : "jy_zd_item",
                 reqDate);