Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into test

cdssman-service/doc/002.20210325自动化测试脚本/cdss_init.sql

@@ -40,7 +40,7 @@ CREATE TABLE `test_case_info`  (
 -- Records of test_case_info
 -- ----------------------------
 INSERT INTO `test_case_info` VALUES (1, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '开单合理性提醒_通用规则', 1, 1);
-INSERT INTO `test_case_info` VALUES (2, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '开单类型提醒_输血规则', 1, 2);
+INSERT INTO `test_case_info` VALUES (2, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '开单合理性提醒_输血规则', 1, 2);
 INSERT INTO `test_case_info` VALUES (3, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '危急值提醒_实验室检查规则', 1, 3);
 INSERT INTO `test_case_info` VALUES (4, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '危急值提醒_辅助检查规则', 1, 4);
 INSERT INTO `test_case_info` VALUES (5, 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '高风险提醒_高危药品规则', 1, 5);
@@ -130,7 +130,7 @@ CREATE TABLE `test_result_rule`  (
   `modifier` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
   `result_id` bigint(20) NOT NULL COMMENT '测试结果id',
   `rule_order_no` bigint(20) NULL DEFAULT NULL COMMENT '规则序号',
-  `rule_type` int(4) NOT NULL COMMENT '规则类型（1：开单-通用，2：开单-输血，3：危急值-检验，4：危急值-检查，5：高危药品，6：高危手术，7：其他值提醒-检验，8-其他值提醒-检查，9-其他值提醒-输血，10：正常项目重复开立）',
+  `rule_type` int(4) NOT NULL COMMENT '规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒;5:其他值提醒输血;6:正常项目重复开立)',
   `rule_id` bigint(20) NULL DEFAULT NULL COMMENT '规则id',
   `rule_lib_type` int(4) NULL DEFAULT NULL COMMENT '规则术语类型编码',
   `rule_lib_type_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '规则术语类型',

cdssman-service/src/main/java/com/diagbot/entity/ResultRule.java

@@ -1,13 +1,13 @@
 package com.diagbot.entity;
 
-import java.math.BigDecimal;
-
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -116,7 +116,7 @@ public class ResultRule implements Serializable {
     /**
      * 基础规则类型(1:开单外等于术语本身;2:开单外存在比较;3:开单外不等于术语本身;4:过敏原;5:开单项;6:检查结果正则表达式)
      */
-    @Excel(name = "基础规则类型", width = 40, orderNum = "1",replace = {"开单外等于术语本身_1","开单外存在比较_2","开单外不等于术语本身_3","过敏原_4","开单项_5","检查结果正则表达式_6"})
+    @Excel(name = "基础规则类型", width = 40, orderNum = "1", replace = { "_null", "开单外等于术语本身_1", "开单外存在比较_2", "开单外不等于术语本身_3", "过敏原_4", "开单项_5", "检查结果正则表达式_6" })
     private Integer ruleBaseType;
 
     /**
@@ -127,25 +127,25 @@ public class ResultRule implements Serializable {
     /**
      * 禁忌项类型（名称）
      */
-    @Excel(name = "基础规则术语类型", width = 40, orderNum = "2")
+    @Excel(name = "基础规则术语类型", width = 40, replace = { "_null" }, orderNum = "2")
     private String ruleBaseLibTypeName;
 
     /**
      * 禁忌项名称
      */
-    @Excel(name = "基础规则医学标准术语", width = 40, orderNum = "3")
+    @Excel(name = "基础规则医学标准术语", width = 40, replace = { "_null" }, orderNum = "3")
     private String ruleBaseLibName;
 
     /**
      * 禁忌项名称（医院端）
      */
-    @Excel(name = "基础规则医院术语", width = 40, orderNum = "4")
+    @Excel(name = "基础规则医院术语", width = 40, replace = { "_null" }, orderNum = "4")
     private String ruleBaseHisName;
 
     /**
      * 禁忌项名称-细项（医院端）
      */
-    @Excel(name = "基础规则医院术语细则", width = 40, orderNum = "5")
+    @Excel(name = "基础规则医院术语细则", width = 40, replace = { "_null" }, orderNum = "5")
     private String ruleBaseHisDetailName;
 
     /**
@@ -166,13 +166,13 @@ public class ResultRule implements Serializable {
     /**
      * 禁忌项输入值（文本/数值）
      */
-    @Excel(name = "基础规则输入值", width = 40, orderNum = "6")
+    @Excel(name = "基础规则输入值", width = 40, replace = { "_null" }, orderNum = "6")
     private String ruleBaseInputValue;
 
     /**
      * 参考值（参考范围拼接/药品分类保存）
      */
-    @Excel(name = "基础规则参考值", width = 40, orderNum = "7")
+    @Excel(name = "基础规则参考值", width = 40, replace = { "_null" }, orderNum = "7")
     private String referenceValue;
 
     /**
@@ -539,4 +539,4 @@ public class ResultRule implements Serializable {
                 ", ruleMsg=" + ruleMsg +
                 "}";
     }
-}
+}