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

doc/013.20210801静态知识法律法规修改成政策法规/cdss_init.sql

@@ -0,0 +1,5 @@
+USE `cdss`;
+
+UPDATE `cdss`.`sys_dictionary_info` SET `id`='130', `is_deleted`='N', `gmt_create`='1970-01-01 12:00:00', `gmt_modified`='1970-01-01 12:00:00', `creator`='0', `modifier`='0', `group_type`='7', `name`='政策法规', `val`='10', `return_type`='2', `order_no`='100', `remark`='静态知识检索类型' WHERE (`id`='130');
+UPDATE `cdss`.`sys_dictionary_info` SET `id`='131', `is_deleted`='N', `gmt_create`='1970-01-01 12:00:00', `gmt_modified`='1970-01-01 12:00:00', `creator`='0', `modifier`='0', `group_type`='10', `name`='政策法规', `val`='10', `return_type`='0', `order_no`='10', `remark`='静态知识类型' WHERE (`id`='131');
+UPDATE `cdss`.`sys_dictionary_info` SET `id`='132', `is_deleted`='N', `gmt_create`='1970-01-01 12:00:00', `gmt_modified`='1970-01-01 12:00:00', `creator`='0', `modifier`='0', `group_type`='13', `name`='政策法规', `val`='政策法规', `return_type`='1', `order_no`='411', `remark`='页面显示词性' WHERE (`id`='132');

doc/013.20210801静态知识法律法规修改成政策法规/med2021_init.sql

@@ -0,0 +1,5 @@
+USE `med_2021`;
+
+update kl_lexicon set name ='政策法规' where code=130;
+UPDATE `med_2021`.`kl_dictionary_info` SET `id`='144', `is_deleted`='N', `gmt_create`='1970-01-01 12:00:00', `gmt_modified`='1970-01-01 12:00:00', `creator`='0', `modifier`='0', `group_type`='7', `name`='政策法规', `val`='10', `return_type`='2', `order_no`='100', `remark`='静态知识检索类型' WHERE (`id`='144');
+UPDATE `med_2021`.`kl_dictionary_info` SET `id`='145', `is_deleted`='N', `gmt_create`='1970-01-01 12:00:00', `gmt_modified`='1970-01-01 12:00:00', `creator`='0', `modifier`='0', `group_type`='13', `name`='政策法规', `val`='政策法规', `return_type`='1', `order_no`='411', `remark`='页面显示词性' WHERE (`id`='145');

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

@@ -6,12 +6,9 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * <p>
- * 诊断依据导出
- * </p>
- *
- * @author kongwz
- * @since 2020-07-28
+ * @description: 开单导出
+ * @author: zhoutg
+ * @date: 2021/8/2 13:40
  */
 @Data
 public class IndicationExportDTO implements Serializable {
@@ -26,8 +23,8 @@ public class IndicationExportDTO implements Serializable {
     private String baseName = "";
     @Excel(name="规则类型", width = 15, orderNum = "35")
     private String baseType;
-    @Excel(name="其他条件", width = 10, orderNum = "40")
-    private String otherType;
+    @Excel(name="禁忌类型", width = 15, orderNum = "40")
+    private String tabooType;
     @Excel(name="最大值", width = 10, orderNum = "50")
     private String maxValue;
     @Excel(name="最大值符号", width = 10, orderNum = "60")
@@ -36,4 +33,10 @@ public class IndicationExportDTO implements Serializable {
     private String minValue;
     @Excel(name="最小值符号", width = 10, orderNum = "80")
     private String minOperator;
+    @Excel(name="原因及建议", width = 15, orderNum = "90")
+    private String msg;
+    @Excel(name="ruleId", width = 10, orderNum = "100")
+    private Long ruleId;
+    @Excel(name="condId", width = 10, orderNum = "110")
+    private Long condId;
 }

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

@@ -36,7 +36,7 @@ public class WordCrfDTO {
     private Double ageNum;
     // 性别（1：男，2：女）
     private Integer sex;
-    //科室
+    // 科室
     private List<Item> dept = new ArrayList<>();
     // 化验项目和结果
     private List<Lis> lis = new ArrayList<>();
@@ -112,6 +112,8 @@ public class WordCrfDTO {
     private String family = "";
     // 查体
     private String vital = "";
+    // 婚姻
+    private String marriage = "";
 
     // 【诊断数据来源】
     private List<Item> diagSource = new ArrayList<>();

src/main/java/com/diagbot/enums/ConEnum.java

@@ -17,14 +17,14 @@ public enum ConEnum implements KeyedNamed {
     oralmeds(4, "禁忌服用药品"),
     allergicmeds(5, "禁忌过敏药品"),
     operations(6, "禁忌手术"),
-    procedures(7, "禁忌操作"),
-    lis(8, "禁忌实验室检查"),
-    pacs(9, "禁忌辅助检查"),
+    procedures(7, "禁忌操作"), // 未使用
+    lis(8, "禁忌检验结果"),
+    pacs(9, "禁忌检查项目"), // 未使用
     disease(10, "禁忌疾病"),
     group(11, "禁忌人群"),
-    conflictmeds(12, "配伍禁忌"),
-    vitals(13, "禁忌查体"),
-    pacsDesc(14, "禁忌辅助检查描述"),
+    conflictmeds(12, "配伍禁忌"), // 未使用
+    vitals(13, "禁忌查体结果"),
+    pacsDesc(14, "禁忌检查结果"),
     medEqu(15, "禁忌医疗器械及物品"),
     exclusion(16, "开单项互斥"),
     otherAllergy(17, "禁忌其他过敏原"),

src/main/java/com/diagbot/enums/LexiconEnum.java

@@ -59,7 +59,7 @@ public enum LexiconEnum implements KeyedNamed {
     LisClassNode(408,"实验室检查类别根节点"),
     PacsClassNode(409,"辅助检查类别根节点"),
     Age(410,"年龄"),
-    Law(130,"法律法规");
+    Law(130,"政策法规");
 
 
     @Setter

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

@@ -108,6 +108,15 @@ public class BillFacade {
                 ruleVO.setLibTypeName(TypeEnum.lis.getName());
                 ruleVO.setDateValue(lis.getDateValue());
                 ruleVOList.add(ruleVO);
+
+                RuleVO ruleVO1 = new RuleVO();
+                ruleVO1.setInputName(lis.getName());
+                ruleVO1.setLibName(lis.getUniqueName());
+                ruleVO1.setLibType(LexiconEnum.LisName.getKey());
+                ruleVO1.setLibTypeName(TypeEnum.lis.getName());
+                ruleVO1.setSuffix(String.valueOf(RuleTypeEnum.repeat.getKey()));
+                ruleVO1.setDateValue(lis.getDateValue());
+                ruleVOList.add(ruleVO1);
             }
         }
 

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

@@ -160,13 +160,13 @@ public class CommonFacade {
             wordCrfDTO.setVital(searchData.getVital());
         }
 
-        //模型处理数据
+        // 模型处理数据
         aiAnalyze.aiProcess(searchData, wordCrfDTO);
 
         // 统一处理化验、辅检、诊断，放入结构化
         processLisPacsDiag(wordCrfDTO);
 
-        // 现病史中体征内容放入体征标签
+        // 现病史的体征内容放入体征标签
         processPresentVital(wordCrfDTO);
 
         // 加入分词

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

@@ -95,7 +95,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
         StaticKnowledgeDTO staticKnowledgeDTO = new StaticKnowledgeDTO();
         Integer type = convertType(staticKnowledgeVO.getType(), 1);
         if (type == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确类型（1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-法律法规）");
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确类型（1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-政策法规）");
         }
         staticKnowledgeVO.setType(type);
 
@@ -398,7 +398,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
             }
         }
         if (ListUtil.isEmpty(staticKnowledgeIndexPageVO.getTypeIds())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确的检索类型（多选）：0-全部、1-诊断、2-药品、3-检验、4-检查、7-手术和操作、8-量表、9-护理、10-法律法规");
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确的检索类型（多选）：0-全部、1-诊断、2-药品、3-检验、4-检查、7-手术和操作、8-量表、9-护理、10-政策法规");
         }
         IPage<StaticKnowledgeIndexPageDTO> page = super.staticIndexPage(staticKnowledgeIndexPageVO);
 

src/main/java/com/diagbot/process/BillProcess.java

@@ -117,7 +117,10 @@ public class BillProcess {
                                     case Disease: // 诊断
                                         commonRule.compareItemWithBill(diags, ruleBaseDTO, billMsgList, ConEnum.disease.getName(), ruleSimpleDTO);
                                         break;
-                                    case LisSubName: // 化验
+                                    case LisName: // 化验开单互斥
+                                        commonRule.exclusionBill(wordCrfDTO.getLisOrder(), ruleBaseDTO, billMsgList, ConEnum.exclusion.getName(), ruleSimpleDTO, set);
+                                        break;
+                                    case LisSubName: // 化验结果
                                         lisRule.bill(wordCrfDTO.getLis(), ruleBaseDTO, billMsgList, ConEnum.lis.getName(), ruleSimpleDTO);
                                         break;
                                     case VitalResult: //体格检查结果
@@ -128,7 +131,7 @@ public class BillProcess {
                                     case PacsSubName: // 辅助检查子项目
                                         if (ruleBaseDTO.getBaseType() != null && ruleBaseDTO.getBaseType().equals(BaseTypeEnum.B5.getKey())) {
                                             // 开单项互斥
-                                            commonRule.exclusionBill(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.exclusion.getName(), ruleSimpleDTO, set);
+                                            commonRule.exclusionBill(wordCrfDTO.getPacsOrder(), ruleBaseDTO, billMsgList, ConEnum.exclusion.getName(), ruleSimpleDTO, set);
                                         } else {
                                             // 辅检项目,暂无数据
                                             pacsRule.bill(wordCrfDTO.getPacs(), ruleBaseDTO, billMsgList, ConEnum.pacs.getName(), ruleSimpleDTO);
@@ -173,8 +176,17 @@ public class BillProcess {
                         break;
                     case repeat:  // redis 数据以 _6结尾
                         for (RuleBaseDTO ruleBaseDTO : ruleBaseDTOList) {
-                            // 无需重复开单项
-                            commonRule.needlessRepeatOrder(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.repeat.getName(), ruleSimpleDTO);
+                            switch (LexiconEnum.getEnum(ruleBaseDTO.getBaseLibType())) {
+                                case PacsName: // 辅助检查项目
+                                case PacsSubName: // 辅助检查子项目
+                                    // 辅检正常值，无需重复开单项
+                                    commonRule.needlessRepeatOrderPacs(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.repeat.getName(), ruleSimpleDTO);
+                                    break;
+                                case LisSubName: // 化验结果
+                                    // 化验正常值，无需重复开单项
+                                    commonRule.needlessRepeatOrderLis(wordCrfDTO, ruleBaseDTO, billMsgList, ConEnum.repeat.getName(), ruleSimpleDTO);
+                                    break;
+                            }
                         }
                         break;
                     default:

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

@@ -1,5 +1,6 @@
 package com.diagbot.rule;
 
+import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.dto.BaseDiagnoseDTO;
 import com.diagbot.dto.BillMsg;
@@ -233,15 +234,16 @@ public class CommonRule {
         }
     }
 
+
     /**
-     * 无需重复开单项
+     * 正常结果，无需重复开单项——辅检
      *
      * @param wordCrfDTO
      * @param ruleBaseDTO
      * @param billMsgList
      * @param ruleSimpleDTO
      */
-    public void needlessRepeatOrder(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO, List<BillMsg> billMsgList, String conType, RuleSimpleDTO ruleSimpleDTO) {
+    public void needlessRepeatOrderPacs(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO, List<BillMsg> billMsgList, String conType, RuleSimpleDTO ruleSimpleDTO) {
         String orderStandName = ruleBaseDTO.getBaseLibName();
         Map<String, List<Pacs>> map = EntityUtil.makeEntityListMap(wordCrfDTO.getPacs(), "uniqueName");
         List<Pacs> pacsList = map.get(orderStandName);
@@ -253,17 +255,42 @@ public class CommonRule {
                     && RegexUtil.getRegexRes(result, ruleBaseDTO.getBaseEqValue())) {
                 String dateValue = pacs.getDateValue(); // 结果日期
                 String orderDateValue = ruleSimpleDTO.getDateValue(); // 开单项日期
-                if (StringUtil.isNotBlank(dateValue) && StringUtil.isNotBlank(orderDateValue)) {
-                    Date dateValueDate = CatalogueUtil.parseStringDate(dateValue);
-                    Date orderDateValueDate = CatalogueUtil.parseStringDate(orderDateValue);
-                    if (dateValueDate != null && orderDateValueDate != null) {
-                        if (!CatalogueUtil.compareTime(dateValueDate, orderDateValueDate, 60L * 24 * 7, false)) {
-                            ruleSimpleDTO.setContent(pacs.getName());
-                            ruleSimpleDTO.setConType(conType);
-                            BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
-                            CoreUtil.addBeanToList(billMsgList, billMsg);
-                        }
-                    }
+                int flag = CoreUtil.compareTime(dateValue, orderDateValue, 60L * 24 * 7, false);
+                if (flag == 1) {
+                    ruleSimpleDTO.setContent(result);
+                    ruleSimpleDTO.setConType(conType);
+                    BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
+                    CoreUtil.addBeanToList(billMsgList, billMsg);
+                }
+            }
+        }
+    }
+
+    /**
+     * 正常结果，无需重复开单项——化验
+     *
+     * @param wordCrfDTO
+     * @param ruleBaseDTO
+     * @param billMsgList
+     * @param ruleSimpleDTO
+     */
+    public void needlessRepeatOrderLis(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO, List<BillMsg> billMsgList, String conType, RuleSimpleDTO ruleSimpleDTO) {
+        String orderStandName = ruleBaseDTO.getBaseLibName();
+        Map<String, List<Lis>> map = EntityUtil.makeEntityListMap(wordCrfDTO.getLis(), "uniqueName");
+        List<Lis> lisList = map.get(orderStandName);
+        if (ListUtil.isNotEmpty(lisList)) {
+            sortByProperty(lisList, "dateValue");
+            Lis lis = lisList.get(lisList.size() - 1); // 按时间排序，取最后一条
+            Map<String, Object> lisMap = CoreUtil.compareLis(ruleBaseDTO, lis);
+            if (CoreUtil.getMapFlag(lisMap)) {
+                String dateValue = lis.getDateValue(); // 结果日期
+                String orderDateValue = ruleSimpleDTO.getDateValue(); // 开单项日期
+                int flag = CoreUtil.compareTime(dateValue, orderDateValue, 60L * 24 * 7, false);
+                if (flag == 1) { // 有效期范围内
+                    ruleSimpleDTO.setContent(CoreUtil.getMapMsg(lisMap));
+                    ruleSimpleDTO.setConType(conType);
+                    BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
+                    CoreUtil.addBeanToList(billMsgList, billMsg);
                 }
             }
         }
@@ -325,25 +352,56 @@ public class CommonRule {
         // repeat24BillWithType(billMsgList, wordCrfDTO.getTransfusionOrder(), TypeEnum.transfusion.getName(), ConEnum.repeat24.getName()); // 输血重复开单
     }
 
+    // /**
+    //  * 互斥开单项——辅检
+    //  *
+    //  * @param wordCrfDTO
+    //  * @param ruleBaseDTO
+    //  * @param billMsgList
+    //  * @param ruleSimpleDTO
+    //  * @param set           用于记录：A与B不宜同时进行, B与A不宜同时进行 只能提示一个
+    //  */
+    // public void exclusionBill(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO, List<BillMsg> billMsgList, String conType, RuleSimpleDTO ruleSimpleDTO, Set<String> set) {
+    //     // 辅检开单项互斥
+    //     List<Pacs> pacsOrder = wordCrfDTO.getPacsOrder();
+    //     if (ListUtil.isNotEmpty(pacsOrder) && pacsOrder.size() > 1) {
+    //         // 不同的辅检项目可能对应同一个uniqueName，提示显示多条
+    //         Map<String, List<Pacs>> map = EntityUtil.makeEntityListMap(pacsOrder, "uniqueName");
+    //         List<Pacs> orginNameList = map.get(ruleBaseDTO.getBaseLibName()); // 互斥名称
+    //         if (map.get(ruleBaseDTO.getBaseLibName()) != null) {
+    //             for (Pacs pacs : orginNameList) {
+    //                 String orginName = pacs.getName();
+    //                 // A与B不宜同时进行, B与A不宜同时进行 只能提示一个
+    //                 if (!set.contains(ruleSimpleDTO.getLibName() + "******" + orginName)) {
+    //                     set.add(ruleSimpleDTO.getLibName() + "******" + orginName);
+    //                     set.add(orginName + "******" + ruleSimpleDTO.getLibName());
+    //                     ruleSimpleDTO.setContent(orginName);
+    //                     ruleSimpleDTO.setConType(conType);
+    //                     BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
+    //                     CoreUtil.addBeanToList(billMsgList, billMsg);
+    //                 }
+    //             }
+    //         }
+    //     }
+    // }
+
     /**
      * 互斥开单项
      *
-     * @param wordCrfDTO
+     * @param orderList      开单列表
      * @param ruleBaseDTO
      * @param billMsgList
      * @param ruleSimpleDTO
      * @param set           用于记录：A与B不宜同时进行, B与A不宜同时进行 只能提示一个
      */
-    public void exclusionBill(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO, List<BillMsg> billMsgList, String conType, RuleSimpleDTO ruleSimpleDTO, Set<String> set) {
-        // 辅检开单项互斥
-        List<Pacs> pacsOrder = wordCrfDTO.getPacsOrder();
-        if (ListUtil.isNotEmpty(pacsOrder) && pacsOrder.size() > 1) {
-            // 不同的辅检项目可能对应同一个uniqueName，提示显示多条
-            Map<String, List<Pacs>> map = EntityUtil.makeEntityListMap(pacsOrder, "uniqueName");
-            List<Pacs> orginNameList = map.get(ruleBaseDTO.getBaseLibName());
+    public <T> void exclusionBill(List<T> orderList, RuleBaseDTO ruleBaseDTO, List<BillMsg> billMsgList, String conType, RuleSimpleDTO ruleSimpleDTO, Set<String> set) {
+        if (ListUtil.isNotEmpty(orderList) && orderList.size() > 1) {
+            // 不同的项目可能对应同一个uniqueName，提示显示多条
+            Map<String, List<T>> map = EntityUtil.makeEntityListMap(orderList, "uniqueName");
+            List<T> orginNameList = map.get(ruleBaseDTO.getBaseLibName());
             if (map.get(ruleBaseDTO.getBaseLibName()) != null) {
-                for (Pacs pacs : orginNameList) {
-                    String orginName = pacs.getName();
+                for (T bean : orginNameList) {
+                    String orginName = ReflectUtil.getProperty(bean, "name");
                     // A与B不宜同时进行, B与A不宜同时进行 只能提示一个
                     if (!set.contains(ruleSimpleDTO.getLibName() + "******" + orginName)) {
                         set.add(ruleSimpleDTO.getLibName() + "******" + orginName);

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

@@ -73,10 +73,15 @@ public class GroupRule {
     public Map rule(WordCrfDTO wordCrfDTO, RuleBaseDTO ruleBaseDTO) {
         Map res = new LinkedHashMap();
         Double age = wordCrfDTO.getAgeNum();
+        Integer sex = wordCrfDTO.getSex();
         // 妊娠目前从诊断里判断,包含“妊娠”
         String symptom = wordCrfDTO.getSymptom(); // 现病史内容
         String menstrual = wordCrfDTO.getMenstrual(); // 月经史
+        String marriage = wordCrfDTO.getMarriage(); // 婚姻
+        String marital = wordCrfDTO.getMarital();// 婚育史
         boolean flag = false;
+        String regex = "";
+        String regex2 = "";
         List<String> nameList = CoreUtil.getSplit(ruleBaseDTO.getBaseLibName());
         for (String name : nameList) {
             switch (name) {
@@ -90,8 +95,8 @@ public class GroupRule {
                     flag = commonRule.containsItem(wordCrfDTO.getDiag(), name);
                     break;
                 case "月经期":
-                    String regex = "月经第(([零一二三四五六七八九十]{0,3})||([0-9]{0,2}))天";
-                    String regex2 = "(?<!上一次)经期";
+                    regex = "月经第(([零一二三四五六七八九十]{0,3})||([0-9]{0,2}))天";
+                    regex2 = "(?<!上一次)经期";
                     if (RegexUtil.getRegexRes(symptom, regex) || RegexUtil.getRegexRes(menstrual, regex)
                             || RegexUtil.getRegexRes(symptom, regex2) || RegexUtil.getRegexRes(menstrual, regex2)) {
                         flag = true;
@@ -121,6 +126,14 @@ public class GroupRule {
                         flag = true;
                     }
                     break;
+                case "未婚女性":
+                    regex = "未婚";
+                    if (sex == 2 &&
+                            (RegexUtil.getRegexRes(marriage, regex) || "2".equals(marriage) || RegexUtil.getRegexRes(marital, regex))
+                    ) {
+                        flag = true;
+                    }
+                    break;
                 default:
                     break;
             }

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

@@ -123,6 +123,25 @@ public class PacsRule {
                             }
                         }
                         break;
+                    case Disease: // 诊断
+                        map = commonRule.compareItem(wordCrfDTO.getDiag(), ruleBaseDTO);
+                        if (CoreUtil.getMapFlag(map)) {
+                            i++;
+                        }
+                        break;
+                    case LisSubName: // 检验结果
+                        map = CoreUtil.compareLis(ruleBaseDTO, wordCrfDTO.getLis());
+                        if (CoreUtil.getMapFlag(map)) {
+                            i++;
+                        }
+                        break;
+                    case VitalResult: //体格检查结果
+                    case Vital: // 体格检查项目
+                        map = CoreUtil.compareVital(ruleBaseDTO, wordCrfDTO.getVitalLabel());
+                        if (CoreUtil.getMapFlag(map)) {
+                            i++;
+                        }
+                        break;
                     default:
                         break;
                 }

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

@@ -153,39 +153,6 @@ public class CatalogueUtil {
         return false;
     }
 
-    /**
-     * 比较时间,以分钟为单位
-     * endDate比startDate多diff分钟则返回true
-     *
-     * @param startDate
-     * @param endDate
-     * @param diff
-     * @return
-     */
-    public static boolean compareTime(Date startDate, Date endDate, Long diff) {
-        boolean overtime = false;
-        if (startDate == null || endDate == null) {
-            return false;
-        }
-        Calendar calendar_s = Calendar.getInstance();
-        Calendar calendar_e = Calendar.getInstance();
-        Long time_s, time_e;
-        try {
-            calendar_s.setTime(startDate);
-            calendar_e.setTime(endDate);
-
-            time_s = calendar_s.getTimeInMillis();
-            time_e = calendar_e.getTimeInMillis();
-
-            if ((time_e - time_s) >  diff * 1000 * 60) {
-                overtime = true;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return overtime;
-    }
-
     /**
      * 比较时间,以分钟为单位
      * endDate比startDate多diff分钟则返回true

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

@@ -23,6 +23,7 @@ import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -264,7 +265,7 @@ public class CoreUtil {
      */
     public static <T> void setUninameFromDetail(List<T> list, String targetProperty) {
         for (T r : list) {
-            String value = (String)getFieldValue(r, "uniqueName");
+            String value = (String) getFieldValue(r, "uniqueName");
             if (StringUtil.isBlank(value)) {
                 String detailName = (String) getFieldValue(r, targetProperty);
                 ReflectUtil.setProperty(r, "uniqueName", detailName);
@@ -338,16 +339,16 @@ public class CoreUtil {
                     if (StringUtil.isNotBlank(lis.getName()) && lis.getName().equals(lis.getDetailName())) {
                         // 有医院原值就提示医院值
                         if (StringUtil.isNotBlank(lis.getResult())) {
-                            map.put("msg", lis.getDetailName() + lis.getResult());
+                            map.put("msg", lis.getDetailName() + "结果" + lis.getResult());
                         } else {
-                            map.put("msg", lis.getDetailName() + lis.getOtherValue());
+                            map.put("msg", lis.getDetailName() + "结果" + lis.getOtherValue());
                         }
                     } else {
                         // 有医院原值就提示医院值
                         if (StringUtil.isNotBlank(lis.getResult())) {
-                            map.put("msg", lis.getName() + lis.getDetailName() + lis.getResult());
+                            map.put("msg", lis.getName() + lis.getDetailName() + "结果" + lis.getResult());
                         } else {
-                            map.put("msg", lis.getName() + lis.getDetailName() + lis.getOtherValue());
+                            map.put("msg", lis.getName() + lis.getDetailName() + "结果" + lis.getOtherValue());
                         }
                     }
                     flag = true;
@@ -358,15 +359,15 @@ public class CoreUtil {
                 if (flag) {
                     if (StringUtil.isNotBlank(lis.getName()) && lis.getName().equals(lis.getDetailName())) {
                         if (StringUtil.isNotBlank(lis.getResult())) {
-                            map.put("msg", lis.getDetailName() + lis.getResult());
+                            map.put("msg", lis.getDetailName() + "结果" + lis.getResult());
                         } else {
-                            map.put("msg", lis.getDetailName() + subZeroAndDot(String.valueOf(lis.getValue())));
+                            map.put("msg", lis.getDetailName() + "结果" + subZeroAndDot(String.valueOf(lis.getValue())));
                         }
                     } else {
                         if (StringUtil.isNotBlank(lis.getResult())) {
-                            map.put("msg", lis.getName() + lis.getDetailName() + lis.getResult());
+                            map.put("msg", lis.getName() + lis.getDetailName() + "结果" + lis.getResult());
                         } else {
-                            map.put("msg", lis.getName() + lis.getDetailName() + subZeroAndDot(String.valueOf(lis.getValue())));
+                            map.put("msg", lis.getName() + lis.getDetailName() + "结果" + subZeroAndDot(String.valueOf(lis.getValue())));
                         }
                     }
                 }
@@ -662,9 +663,9 @@ public class CoreUtil {
                 int indexSui = ageStr.indexOf("岁");
                 ageArr[0] = ageStr.substring(0, indexSui);
                 if (ageStr.indexOf("个月") > -1) { // 3岁7个月
-                    ageArr[1] = ageStr.substring(indexSui + 1,ageStr.indexOf("个月"));
+                    ageArr[1] = ageStr.substring(indexSui + 1, ageStr.indexOf("个月"));
                 } else { // 3岁7月
-                    ageArr[1] = ageStr.substring(indexSui + 1,ageStr.indexOf("月"));
+                    ageArr[1] = ageStr.substring(indexSui + 1, ageStr.indexOf("月"));
                 }
                 return Double.parseDouble(ageArr[0]) + getHalfUp(Double.parseDouble(ageArr[1]) / 12);
             }
@@ -854,6 +855,22 @@ public class CoreUtil {
         return false;
     }
 
+    /**
+     * 获取mapMsg值
+     *
+     * @param map
+     * @return
+     */
+    public static String getMapMsg(Map map) {
+        if (map != null && map.get("flag") != null && (Boolean) map.get("flag") == true) {
+            String msg = (String) map.get("msg");
+            if (StringUtil.isNotBlank(msg)) {
+                return msg;
+            }
+        }
+        return "";
+    }
+
     /**
      * 获取mapMsgList值
      *
@@ -1041,12 +1058,13 @@ public class CoreUtil {
 
     /**
      * 将字符串以“，”分隔，添加到list列表中
+     *
      * @param list
      * @param s
      */
     public static void addSplitString(List<Long> list, String s) {
         if (StringUtil.isBlank(s)) {
-            return ;
+            return;
         }
         list.addAll(Arrays.stream(s.split(",")).map(r -> Long.parseLong(r)).collect(Collectors.toList()));
     }
@@ -1059,7 +1077,7 @@ public class CoreUtil {
      */
     public static void removeRepeat(List<String> orginList, List<String> splitList) {
         if (ListUtil.isEmpty(orginList) || ListUtil.isEmpty(splitList)) {
-            return ;
+            return;
         }
         Iterator<String> iterator = orginList.iterator();
         while (iterator.hasNext()) {
@@ -1084,7 +1102,7 @@ public class CoreUtil {
         }
         for (T t : tList) {
             for (String key : propertyName) {
-                String name = (String)getFieldValue(t, key);
+                String name = (String) getFieldValue(t, key);
                 // 去重
                 if (StringUtil.isNotBlank(name) && !list.contains(name)) {
                     list.add(name);
@@ -1115,13 +1133,13 @@ public class CoreUtil {
      */
     public static <T> void removeRepeat(List<T> source, String property) {
         if (ListUtil.isEmpty(source) || source.size() < 2) {
-            return ;
+            return;
         }
         List<Object> list = Lists.newArrayList();
         Iterator<T> iterator = source.iterator();
         T t = null;
         Object object = null;
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             t = iterator.next();
             object = getFieldValue(t, property);
             if (object != null) {
@@ -1162,6 +1180,7 @@ public class CoreUtil {
 
     /**
      * 根据分隔符转成list
+     *
      * @param name
      * @return
      */
@@ -1183,6 +1202,45 @@ public class CoreUtil {
         return Lists.newArrayList(name.split(splitSymbol));
     }
 
+    /**
+     * 时间差值(绝对值)和指定分钟数进行比较
+     *
+     * @param startDateStr 开始时间
+     * @param endDateStr   结束时间
+     * @param minute       分钟
+     * @param hasEqual     是否包含等于
+     * @return 返回值：-1：无法比较或出错，0：时间差超出范围，1：时间差在范围内
+     */
+    public static int compareTime(String startDateStr, String endDateStr, Long minute, boolean hasEqual) {
+        int flag = -1;
+        if (StringUtil.isBlank(startDateStr) || StringUtil.isBlank(endDateStr)) {
+            return flag;
+        }
+        try {
+            Date startDate = CatalogueUtil.parseStringDate(startDateStr);
+            Date endDate = CatalogueUtil.parseStringDate(endDateStr);
+            Long timeStart = startDate.getTime();
+            Long timeEnd = endDate.getTime();
+
+            if (hasEqual) {
+                if (Math.abs(timeEnd - timeStart) >= minute * 1000 * 60) {
+                    flag = 0;
+                } else {
+                    flag = 1;
+                }
+            } else {
+                if (Math.abs(timeEnd - timeStart) > minute * 1000 * 60) {
+                    flag = 0;
+                } else {
+                    flag = 1;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return flag;
+    }
+
     public static void main(String[] args) {
         List<PushBaseDTO> pushBaseDTOList = ListUtil.newArrayList();
         PushBaseDTO pushBaseDTO = new PushBaseDTO();

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

@@ -32,22 +32,22 @@ public class MsgNewUtil {
         String conType = ruleSimpleDTO.getConType(); // 禁忌类型
         String unionMsg = ruleSimpleDTO.getMsg(); // 原因及建议
         String msg = redisUtil.getByKeyAndField(RedisEnum.msg.getName(), orderType + "_" + conType);
-        if (StringUtil.isBlank(msg)) {
-            msg = redisUtil.getByKeyAndField(RedisEnum.msg.getName(), "通用" + "_" + "默认提示语");
-        }
+        // if (StringUtil.isBlank(msg)) {
+        //     msg = redisUtil.getByKeyAndField(RedisEnum.msg.getName(), "通用" + "_" + "默认提示语");
+        // }
         BillMsg billMsg = new BillMsg();
-        // 去除2个“具有”的提示语
+        // 出现2个“具有”，去除一个为空
         if (ConEnum.medEqu.getName().equals(conType) && StringUtil.isNotBlank(content)
-                && content.startsWith("具有") && msg.endsWith("具有")) {
-            msg.replaceAll("具有", "");
+                && content.startsWith("具有") && msg.startsWith("该患者具有")) {
+            msg = msg.replaceAll("具有", "");
         }
-        msg = msg.replaceAll("\\[匹配内容]", content);
-        msg = msg.replaceAll("\\[开单名称]", orderName);
         if (StringUtil.isNotBlank(unionMsg)) {
-            msg = msg.replaceAll("\\[原因及建议]", unionMsg);
+            msg = msg.replaceAll("\\[原因及建议]", "，" + unionMsg);
         } else {
             msg = msg.replaceAll("\\[原因及建议]", "");
         }
+        msg = msg.replaceAll("\\[匹配内容]", content);
+        msg = msg.replaceAll("\\[开单名称]", orderName);
         billMsg.setMsg(msg);
         billMsg.setOrderName(orderName);
         billMsg.setOrderStandName(orderStandName);

src/main/java/com/diagbot/web/KlConceptStaticController.java

@@ -45,7 +45,7 @@ public class KlConceptStaticController {
     KlConceptStaticFacade klConceptStaticFacade;
 
     @ApiOperation(value = "获取静态知识[zhaops]",
-            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-法律法规 <br>" +
+            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-政策法规 <br>" +
                     "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径、4-治疗方案<br>" +
                     "name： 标准术语名称<br>")
     @PostMapping("/getStaticKnowledge")
@@ -56,7 +56,7 @@ public class KlConceptStaticController {
     }
 
     @ApiOperation(value = "获取静态知识列表[zhaops]",
-            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-法律法规  <br>" +
+            notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-政策法规  <br>" +
                     "name： 术语名称<br>" +
                     "status： 启用状态：1-启用、0-禁用<br>")
     @PostMapping("/getPage")
@@ -70,7 +70,7 @@ public class KlConceptStaticController {
     }
 
     @ApiOperation(value = "静态知识检索（分页返回）[zhaops]",
-            notes = "types： 类型（多选）：0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理、10-法律法规  <br>" +
+            notes = "types： 类型（多选）：0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理、10-政策法规  <br>" +
                     "inputStr： 检索内容<br>")
     @PostMapping("/staticIndexPage")
     @SysLogger("staticIndexPage")
@@ -86,7 +86,7 @@ public class KlConceptStaticController {
     @ApiOperation(value = "保存静态知识-新增或修改[zhaops]",
             notes = "id： id <br>" +
                     "name： 术语名称 <br>" +
-                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-法律法规  <br>" +
+                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-政策法规  <br>" +
                     "clinicalPathwayName： 临床路径名称<br>" +
                     "noticeName： 注意事项名称<br>" +
                     "source：数据来源：0-医院端、1-云平台，默认0 <br>" +
@@ -122,7 +122,7 @@ public class KlConceptStaticController {
 
     @ApiOperation(value = "静态知识是否存在[zhaops]",
             notes = "name： 术语名称 <br>" +
-                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-法律法规  <br>")
+                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理、10-政策法规  <br>")
     @PostMapping("/isExist")
     @SysLogger("isExist")
     public RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {

src/main/java/com/diagbot/web/RetrievalController.java

@@ -52,7 +52,7 @@ public class RetrievalController {
     }
 
     @ApiOperation(value = "医学知识（静态知识）检索[zhaops]",
-            notes = "types： 类型（多选）：0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理、10-法律法规 <br>" +
+            notes = "types： 类型（多选）：0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理、10-政策法规 <br>" +
                     "inputStr： 检索内容<br>")
     @PostMapping("/staticKnowledgeIndex")
     public RespDTO<List<StaticKnowledgeIndexDTO>> staticKnowledgeIndex(@Valid @RequestBody StaticKnowledgeIndexVO staticKnowledgeIndexVO) {

src/main/resources/mapper/KlRuleMapper.xml

@@ -233,10 +233,12 @@
             tt1.par_type,
             tt2.lib_name base_name,
             xx2.NAME base_type,
-            CASE tt1.type
-                when '4' then '过敏原'
-                when '5' then '辅检开单互斥'
-                else '' end other_type,
+            CASE
+                when tt1.type = '4' and xx2.`name` in ('药品通用名','药品化学物质类别','药品治疗学类别','药品药理学类别','药品解剖学类别') then '药物过敏原'
+                when tt1.type = '1' and xx2.`name` in ('药品通用名','药品化学物质类别','药品治疗学类别','药品药理学类别','药品解剖学类别') then '服用药品'
+                when tt1.type = '5' then '开单项互斥'
+                else xx2.name
+			end taboo_type,
             tt1.eq_value,
             tt1.min_value,
             tt1.min_operator,
@@ -244,8 +246,10 @@
             tt1.max_value,
             tt1.max_operator,
             tt1.max_unit,
+			tt1.description,
+			tt1.msg,
             tt1.rule_id,
-            tt1.description
+            tt1.cond_id
         FROM
             (
                 SELECT
@@ -256,7 +260,8 @@
                     t1.description,
                     t1.rule_type,
                     t1.has_sub_cond,
-                    t1.msg,
+                    t2.id cond_id,
+					t2.msg,
                     t3.type,
                     t3.concept_id base_id,
                     t3.eq_value,
@@ -289,8 +294,7 @@
         AND tt2.`status` = 1
         AND tt1.base_id = tt2.id
         LEFT JOIN kl_lexicon xx2 ON tt2.lib_type = xx2. CODE
-        ORDER BY
-            rule_id
+        ORDER BY par_name, rule_id
     </select>
 
     <select id="getRuleInitDTO" resultType="com.diagbot.dto.RuleInitDTO">