Merge remote-tracking branch 'origin/dev/mapping20210603' into dev/mapping20210603

src/main/java/com/diagbot/dto/WordCrfDTO.java

@@ -88,6 +88,8 @@ public class WordCrfDTO {
     private List<Item> operationOrder = new ArrayList<>();
     // 当前输血开单项
     private List<ItemExt> transfusionOrder = new ArrayList<>();
+    // 输血记录
+    private List<ItemExt> transfusion = new ArrayList<>();
     /*******************************************入参数据拷贝结束******************************/
     // 化验
     // private LisLabel lisLabel;

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -108,6 +108,9 @@ public class CommonFacade {
         if (ListUtil.isNotEmpty(searchData.getDrug())) {
             wordCrfDTO.setDrug(searchData.getDrug());
         }
+        if (ListUtil.isNotEmpty(searchData.getTransfusion())) {
+            wordCrfDTO.setTransfusion(searchData.getTransfusion());
+        }
         if (ListUtil.isNotEmpty(searchData.getOperation())) {
             wordCrfDTO.setOperation(searchData.getOperation());
         }

src/main/java/com/diagbot/rule/CommonRule.java

@@ -329,7 +329,7 @@ public class CommonRule {
      * @param ruleBaseDTO
      * @param billMsgList
      * @param ruleSimpleDTO
-     * @param set 用于记录：A与B不宜同时进行, B与A不宜同时进行 只能提示一个
+     * @param set           用于记录：A与B不宜同时进行, B与A不宜同时进行 只能提示一个
      */
     public void exclusionBill(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO, List<BillMsg> billMsgList, String conType, RuleSimpleDTO ruleSimpleDTO, Set<String> set) {
         // 辅检开单项互斥
@@ -380,7 +380,7 @@ public class CommonRule {
      * @param billMsgList
      * @param itemList
      * @param type
-     * @param conType 禁忌条件
+     * @param conType     禁忌条件
      * @param <T>
      */
     public <T> void repeat24BillWithType(List<BillMsg> billMsgList, List<T> itemList, String type, String conType) {
@@ -401,8 +401,8 @@ public class CommonRule {
                             T itNext = items.get(j);
                             String nextDateValue = ReflectUtil.getProperty(itNext, "dateValue");
                             if (StringUtil.isNotBlank(nextDateValue)) {
-                                Date netDate = CatalogueUtil.parseStringDate(nextDateValue);
-                                if (!CatalogueUtil.compareTime(netDate, curDate, 60L * 24, true)
+                                Date nextDate = CatalogueUtil.parseStringDate(nextDateValue);
+                                if (!CatalogueUtil.compareTime(curDate, nextDate, 60L * 24, true)
                                         && getFrquenceType(ReflectUtil.getProperty(it, "frequency"))
                                         .equals(getFrquenceType(ReflectUtil.getProperty(itNext, "frequency")))) {
                                     String name = (String) CoreUtil.getFieldValue(it, "name");

src/main/java/com/diagbot/util/CatalogueUtil.java

@@ -211,9 +211,9 @@ public class CatalogueUtil {
             time_s = calendar_s.getTimeInMillis();
             time_e = calendar_e.getTimeInMillis();
             if (hasEqual) {
-                return (time_e - time_s) >=  diff * 1000 * 60;
+                return Math.abs(time_e - time_s) >= diff * 1000 * 60;
             } else {
-                return (time_e - time_s) >  diff * 1000 * 60;
+                return Math.abs(time_e - time_s) > diff * 1000 * 60;
             }
         } catch (Exception e) {
             e.printStackTrace();