Browse Source

代码优化

gaodm 4 years ago
parent
commit
067b06ff2c

+ 1 - 1
src/main/java/com/diagbot/entity/KlRule.java

@@ -60,7 +60,7 @@ public class KlRule implements Serializable {
     private String description;
 
     /**
-     * 规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒5:其他值提醒输血)
+     * 规则类型(1:开单合理性;2:高危;3:危急值;4:其他值提醒;5:其他值提醒输血;6:正常项目重复开立)
      */
     private Integer ruleType;
 

+ 1 - 1
src/main/java/com/diagbot/entity/KlRuleBase.java

@@ -60,7 +60,7 @@ public class KlRuleBase implements Serializable {
     private String description;
 
     /**
-     * 基础规则类型(1:开单外等于术语本身;2:开单外存在比较;3:开单外不等于术语本身;4:过敏原;5:开单项;)
+     * 基础规则类型(1:开单外等于术语本身;2:开单外存在比较;3:开单外不等于术语本身;4:过敏原;5:开单项;6:检查结果正则表达式)
      */
     private Integer type;
 

File diff suppressed because it is too large
+ 79 - 16
src/main/java/com/diagbot/facade/ExportFacade.java


+ 8 - 0
src/main/java/com/diagbot/vo/ImportDataVO.java

@@ -103,6 +103,14 @@ public class ImportDataVO {
     @Excel(name="状态")
     private String status;
 
+    //=================================
+    @Excel(name="辅助检查名称")
+    private String pacsName;
+    @Excel(name="正常规则")
+    private String normalRule;
+    @Excel(name="正则表达式")
+    private String regex;
+
     //==================================
     @Excel(name="医保-ICD-10-疾病名称")
     private String diseasePush;