occ 提示

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

@@ -109,7 +109,6 @@ public interface YiZhuLuRuDao {
                                 @Param("ledgerSn") Integer ledgerSn);
 
 
-
     @Select("select                     cast(a.act_order_no as decimal) as act_order_no, " +
             "                           cast(cast(a.act_order_no as decimal) as varchar) id, " +
             "    newOrderFlag         = (select count(*) " +
@@ -1454,6 +1453,6 @@ public interface YiZhuLuRuDao {
 
     @Select("select count(1) from yz_act_order where inpatient_no = '${patNo}' and admiss_times = ${times} and " +
             "order_code = '${orderCode}' and serial = '00'")
-    Integer selectCountByOrderCode(String patNo,Integer times ,String orderCode);
+    Integer selectCountByOrderCode(String patNo, Integer times, String orderCode);
 
 }

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

@@ -41,6 +41,7 @@ import thyyxxk.webserver.service.zhuyuanyisheng.yizhuverify.Repel;
 import thyyxxk.webserver.service.zhuyuanyisheng.yizhuverify.YiZhuCheckData;
 import thyyxxk.webserver.utils.*;
 
+import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1451,5 +1452,4 @@ public class YiZhuLuRuServer {
         return ResultVoUtil.success(js);
     }
 
-
 }

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

@@ -275,6 +275,9 @@ public class YiZhuCheckData {
         } else {
             // 计算普通药品的领量 durg_quan durg_occ
             calculateDrugAmount(item, detailsOfDrugs);
+            if (item.getDrugOcc() == null) {
+                errorMessage.add("医嘱领量错误，请重新选择【剂量单位】，或这可能药房剂量维护错误。");
+            }
         }
     }
 
@@ -331,7 +334,7 @@ public class YiZhuCheckData {
         item.setDrugVolume(feiYongXinXi.getDrugVolume());
         item.setDrugVolUnit(feiYongXinXi.getDrugWeightUnit());
 
-        String doseUnit = StringUtil.notBlank(item.getDoseUnit()) ? "" : item.getDoseUnit().trim();
+        String doseUnit = StringUtil.isBlank(item.getDoseUnit()) ? "" : item.getDoseUnit().trim();
 
         if (StringUtil.notBlank(feiYongXinXi.getDrugWeightUnit()) && doseUnit.equals(feiYongXinXi.getDrugWeightUnit().trim())) {
             item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getDrugWeight(), 2));
@@ -340,6 +343,7 @@ public class YiZhuCheckData {
         } else if (StringUtil.notBlank(feiYongXinXi.getPackUnit()) && doseUnit.equals(feiYongXinXi.getPackUnit().trim())) {
             item.setDrugOcc(DecimalUtil.divide(item.getDose(), feiYongXinXi.getPackSize(), 2));
         }
+
     }