医学规则测试：

1、导出
2、并发

cdssman-service/pom.xml

@@ -231,6 +231,13 @@
             <artifactId>easypoi-spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.lvyahui8</groupId>
+            <artifactId>spring-boot-data-aggregator-starter</artifactId>
+            <version>${aggregator.version}</version>
+        </dependency>
+
+
     </dependencies>
 
     <build>

cdssman-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -27,7 +27,7 @@ public class MybatisPlusConfigurer {
         // 设置请求的页面大于最大页后操作,true调回到首页,false继续请求,默认false
         //paginationInterceptor.setOverflow(false);
         // 设置最大单页限制数量,默认500条,-1不受限制
-        paginationInterceptor.setLimit(500L);
+        paginationInterceptor.setLimit(-1L);
         return paginationInterceptor;
     }
 

cdssman-service/src/main/java/com/diagbot/dto/ExportBillDTO.java

@@ -0,0 +1,170 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/1/20 13:52
+ */
+@Getter
+@Setter
+public class ExportBillDTO {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 测试结果id
+     */
+    private Long resultId;
+
+    /**
+     * 开单类型（1：通用，2：输血）
+     */
+    private Integer billType;
+
+    /**
+     * 开单项类型
+     */
+    @Excel(name = "开单项类型", width = 40, orderNum = "2")
+    private String billItemType;
+
+    /**
+     * 开单项名称
+     */
+    @Excel(name = "开单项（标准术语）", width = 40, orderNum = "3")
+    private String billItemName;
+
+    /**
+     * 开单项名称（医院端）
+     */
+    @Excel(name = "开单项（医院术语）", width = 40, orderNum = "4")
+    private String billItemHisName;
+
+    /**
+     * 开单项名称-细项（医院端）
+     */
+    private String billItemHisDetailName;
+
+    /**
+     * 禁忌项类型
+     */
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "5")
+    private String conflictItemType;
+
+    /**
+     * 禁忌项名称
+     */
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "6")
+    private String conflictItemName;
+
+    /**
+     * 禁忌项名称（医院端）
+     */
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "7")
+    private String conflictItemHisName;
+
+    /**
+     * 禁忌项名称-细项（医院端）
+     */
+    @Excel(name = "禁忌项细项（医院术语）", width = 40, orderNum = "8")
+    private String conflictItemHisDetailName;
+
+    /**
+     * 输入值（文本/数值）
+     */
+    @Excel(name = "禁忌项输入值/结果", width = 40, orderNum = "9")
+    private String inputValue;
+
+    /**
+     * 参考值
+     */
+    private String referenceValue;
+
+    /**
+     * 参考值（最大值）
+     */
+    private BigDecimal maxValue;
+
+    /**
+     * 参考值（最小值）
+     */
+    private BigDecimal minValue;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 范围（0：范围内，1：范围外）
+     */
+    private Integer conflictItemRange;
+
+    /**
+     * 输出结果（提醒文本）
+     */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
+    private String output;
+
+    /**
+     * 期望输出结果（提醒文本）
+     */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
+    private String expectedOutput;
+
+    /**
+     * 成功标志（1：成功，0：失败）
+     */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
+    private Integer success;
+
+    /**
+     * 提示信息（异常提醒）
+     */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
+    private String message;
+
+    /**
+     * 模拟入参
+     */
+    private String inputParams;
+}

cdssman-service/src/main/java/com/diagbot/dto/ExportBillTransfusionDTO.java

@@ -0,0 +1,169 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/1/20 13:53
+ */
+@Getter
+@Setter
+public class ExportBillTransfusionDTO {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 测试结果id
+     */
+    private Long resultId;
+
+    /**
+     * 开单类型（1：通用，2：输血）
+     */
+    private Integer billType;
+
+    /**
+     * 开单项类型
+     */
+    private String billItemType;
+
+    /**
+     * 开单项名称
+     */
+    @Excel(name = "输注类型（标准术语）", width = 40, orderNum = "3")
+    private String billItemName;
+
+    /**
+     * 开单项名称（医院端）
+     */
+    @Excel(name = "输注类型（医院术语）", width = 40, orderNum = "4")
+    private String billItemHisName;
+
+    /**
+     * 开单项名称-细项（医院端）
+     */
+    private String billItemHisDetailName;
+
+    /**
+     * 禁忌项类型
+     */
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "5")
+    private String conflictItemType;
+
+    /**
+     * 禁忌项名称
+     */
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "6")
+    private String conflictItemName;
+
+    /**
+     * 禁忌项名称（医院端）
+     */
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "7")
+    private String conflictItemHisName;
+
+    /**
+     * 禁忌项名称-细项（医院端）
+     */
+    @Excel(name = "禁忌项细项（医院术语）", width = 40, orderNum = "8")
+    private String conflictItemHisDetailName;
+
+    /**
+     * 输入值（文本/数值）
+     */
+    @Excel(name = "禁忌项输入值/结果", width = 40, orderNum = "9")
+    private String inputValue;
+
+    /**
+     * 参考值
+     */
+    private String referenceValue;
+
+    /**
+     * 参考值（最大值）
+     */
+    private BigDecimal maxValue;
+
+    /**
+     * 参考值（最小值）
+     */
+    private BigDecimal minValue;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 范围（0：范围内，1：范围外）
+     */
+    private Integer conflictItemRange;
+
+    /**
+     * 输出结果（提醒文本）
+     */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
+    private String output;
+
+    /**
+     * 期望输出结果（提醒文本）
+     */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
+    private String expectedOutput;
+
+    /**
+     * 成功标志（1：成功，0：失败）
+     */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
+    private Integer success;
+
+    /**
+     * 提示信息（异常提醒）
+     */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
+    private String message;
+
+    /**
+     * 模拟入参
+     */
+    private String inputParams;
+}

cdssman-service/src/main/java/com/diagbot/dto/ExportCriticalLisDTO.java

@@ -0,0 +1,158 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/1/20 13:46
+ */
+@Getter
+@Setter
+public class ExportCriticalLisDTO {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 测试结果id
+     */
+    private Long resultId;
+
+    /**
+     * 危机值开单项类型（1：实验室检查、2：辅助检查）
+     */
+    private Integer criticalType;
+
+    /**
+     * 开单项类型
+     */
+    private String criticalItemType;
+
+    /**
+     * 开单项名称
+     */
+    @Excel(name = "实验室检查名称（标准术语）", width = 40, orderNum = "2")
+    private String criticalItemName;
+
+    /**
+     * 开单项名称（医院端）
+     */
+    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "3")
+    private String criticalItemHisName;
+
+    /**
+     * 开单项名称-细项（医院端）
+     */
+    @Excel(name = "实验室检查名称-细项（医院术语）", width = 40, orderNum = "4")
+    private String criticalItemHisDetailName;
+
+    /**
+     * 输入值（文本/数值）
+     */
+    @Excel(name = "输入值", width = 40, orderNum = "7")
+    private String inputValue;
+
+    /**
+     * 参考值
+     */
+    private String referenceValue;
+
+    /**
+     * 范围（0：范围内，1：范围外）
+     */
+    private Integer criticalItemRange;
+
+    /**
+     * 参考值（最小值）
+     */
+    @Excel(name = "低危急值", width = 40, orderNum = "6")
+    private BigDecimal minValue;
+
+    /**
+     * 参考值（最大值）
+     */
+    @Excel(name = "高危急值", width = 40, orderNum = "5")
+    private BigDecimal maxValue;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 年龄最小值
+     */
+    private Integer minAge;
+
+    /**
+     * 年龄最大值
+     */
+    private Integer maxAge;
+
+    /**
+     * 输出结果（提醒文本）
+     */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
+    private String output;
+
+    /**
+     * 期望输出结果（提醒文本）
+     */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
+    private String expectedOutput;
+
+    /**
+     * 成功标志（1：成功，0：失败）
+     */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
+    private Integer success;
+
+    /**
+     * 提示信息（异常提醒）
+     */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
+    private String message;
+
+    /**
+     * 模拟入参
+     */
+    private String inputParams;
+}

cdssman-service/src/main/java/com/diagbot/dto/ExportCriticalPacsDTO.java

@@ -0,0 +1,155 @@
+package com.diagbot.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/1/20 13:48
+ */
+@Getter
+@Setter
+public class ExportCriticalPacsDTO {
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 测试结果id
+     */
+    private Long resultId;
+
+    /**
+     * 危机值开单项类型（1：实验室检查、2：辅助检查）
+     */
+    private Integer criticalType;
+
+    /**
+     * 开单项类型
+     */
+    private String criticalItemType;
+
+    /**
+     * 开单项名称
+     */
+    @Excel(name = "辅检名称（标准术语）", width = 40, orderNum = "2")
+    private String criticalItemName;
+
+    /**
+     * 开单项名称（医院端）
+     */
+    @Excel(name = "辅检名称（医院术语）", width = 40, orderNum = "3")
+    private String criticalItemHisName;
+
+    /**
+     * 开单项名称-细项（医院端）
+     */
+    private String criticalItemHisDetailName;
+
+    /**
+     * 输入值（文本/数值）
+     */
+    @Excel(name = "辅检结果描述", width = 40, orderNum = "7")
+    private String inputValue;
+
+    /**
+     * 参考值
+     */
+    private String referenceValue;
+
+    /**
+     * 范围（0：范围内，1：范围外）
+     */
+    private Integer criticalItemRange;
+
+    /**
+     * 参考值（最小值）
+     */
+    private BigDecimal minValue;
+
+    /**
+     * 参考值（最大值）
+     */
+    private BigDecimal maxValue;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 年龄最小值
+     */
+    private Integer minAge;
+
+    /**
+     * 年龄最大值
+     */
+    private Integer maxAge;
+
+    /**
+     * 输出结果（提醒文本）
+     */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
+    private String output;
+
+    /**
+     * 期望输出结果（提醒文本）
+     */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
+    private String expectedOutput;
+
+    /**
+     * 成功标志（1：成功，0：失败）
+     */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
+    private Integer success;
+
+    /**
+     * 提示信息（异常提醒）
+     */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
+    private String message;
+
+    /**
+     * 模拟入参
+     */
+    private String inputParams;
+}

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

@@ -1,8 +1,10 @@
 package com.diagbot.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -39,6 +41,8 @@ public class ResultHighriskDrug implements Serializable {
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
 
     /**
@@ -56,37 +60,46 @@ public class ResultHighriskDrug implements Serializable {
      */
     private Long resultId;
 
+    @Excel(name = "药品通用名称（标准术语）", width = 40, orderNum = "2")
     private String highriskItemName;
 
+    @Excel(name = "药品注册名称", width = 40, orderNum = "4")
     private String highriskItemRegName;
 
+    @Excel(name = "药品通用名称（医院术语）", width = 40, orderNum = "3")
     private String highriskItemHisName;
 
+    @Excel(name = "剂型", width = 40, orderNum = "5")
     private String highriskItemForm;
 
     /**
      * 药品高危级别（A级高危、B级高危、C级高危）
      */
+    @Excel(name = "药品高危级别", width = 40, orderNum = "6")
     private String highriskLevel;
 
     /**
      * 输出结果（提醒文本）
      */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
     private String output;
 
     /**
      * 期望输出结果（提醒文本）
      */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
     private String expectedOutput;
 
     /**
      * 成功标志（1：成功，0：失败）
      */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
     private Integer success;
 
     /**
      * 提示信息（异常提醒）
      */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
     private String message;
 
     /**

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

@@ -1,9 +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 com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -39,6 +43,8 @@ public class ResultHighriskOperation implements Serializable {
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
 
     /**
@@ -59,36 +65,43 @@ public class ResultHighriskOperation implements Serializable {
     /**
      * 标准名称
      */
+    @Excel(name = "手术名称（标准术语）", width = 40, orderNum = "2")
     private String highriskItemName;
 
     /**
      * 医院端名称
      */
+    @Excel(name = "手术名称（医院术语）", width = 40, orderNum = "3")
     private String highriskItemHisName;
 
     /**
      * 手术级别（1、2、3、4、5）
      */
+    @Excel(name = "手术级别", width = 20, orderNum = "4")
     private String level;
 
     /**
      * 高危条件名称
      */
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "6")
     private String factorItemName;
 
     /**
      * 高危条件医院端名称
      */
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "7")
     private String factorItemHisName;
 
     /**
      * 高危条件医院端名称-细项
      */
+    @Excel(name = "禁忌项-细项（医院术语）", width = 40, orderNum = "8")
     private String factorItemHisDetailName;
 
     /**
      * 高危条件类型
      */
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "5")
     private String factorItemType;
 
     /**
@@ -109,6 +122,7 @@ public class ResultHighriskOperation implements Serializable {
     /**
      * 输入值
      */
+    @Excel(name = "禁忌项输入值/结果", width = 40, orderNum = "8")
     private String inputValue;
 
     /**
@@ -129,21 +143,25 @@ public class ResultHighriskOperation implements Serializable {
     /**
      * 输出结果（提醒文本）
      */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
     private String output;
 
     /**
      * 期望输出结果（提醒文本）
      */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
     private String expectedOutput;
 
     /**
      * 成功标志（1：成功，0：失败）
      */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
     private Integer success;
 
     /**
      * 提示信息（异常提醒）
      */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
     private String message;
 
     /**

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

@@ -1,9 +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 com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -39,6 +43,8 @@ public class ResultOtherLis implements Serializable {
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
 
     /**
@@ -64,11 +70,13 @@ public class ResultOtherLis implements Serializable {
     /**
      * 其他开单项名称
      */
+    @Excel(name = "实验室检查名称（标准术语）", width = 40, orderNum = "2")
     private String otherItemName;
 
     /**
      * 其他开单项名称（医院端）
      */
+    @Excel(name = "实验室检查名称（医院术语））", width = 40, orderNum = "3")
     private String otherItemHisName;
 
     /**
@@ -84,16 +92,19 @@ public class ResultOtherLis implements Serializable {
     /**
      * 提醒项类型
      */
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "5")
     private String remindItemType;
 
     /**
      * 提醒项名称
      */
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "6")
     private String remindItemName;
 
     /**
      * 提醒项名称（医院端）
      */
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "7")
     private String remindItemHisName;
 
     /**
@@ -104,6 +115,7 @@ public class ResultOtherLis implements Serializable {
     /**
      * 输入值
      */
+    @Excel(name = "实验室检查数值", width = 40, orderNum = "4")
     private String inputValue;
 
     /**
@@ -129,21 +141,25 @@ public class ResultOtherLis implements Serializable {
     /**
      * 输出结果（提醒文本）
      */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
     private String output;
 
     /**
      * 期望输出结果（提醒文本）
      */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
     private String expectedOutput;
 
     /**
      * 成功标志（1：成功，0：失败）
      */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
     private Integer success;
 
     /**
      * 提示信息（异常提醒）
      */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
     private String message;
 
     /**

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

@@ -1,9 +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 com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -39,6 +43,8 @@ public class ResultOtherPacs implements Serializable {
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
 
     /**
@@ -64,21 +70,25 @@ public class ResultOtherPacs implements Serializable {
     /**
      * 辅检结果
      */
+    @Excel(name = "检查结果描述（标准术语）", width = 40, orderNum = "2")
     private String pacsResult;
 
     /**
      * 提醒项类型
      */
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "5")
     private String remindItemType;
 
     /**
      * 提醒项名称
      */
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "6")
     private String remindItemName;
 
     /**
      * 提醒项名称（医院端）
      */
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "7")
     private String remindItemHisName;
 
     /**
@@ -109,11 +119,13 @@ public class ResultOtherPacs implements Serializable {
     /**
      * 输入值
      */
+    @Excel(name = "年龄", width = 40, orderNum = "4")
     private String inputAge;
 
     /**
      * 性别
      */
+    @Excel(name = "性别", width = 40, orderNum = "3")
     private String gender;
 
     /**
@@ -129,21 +141,25 @@ public class ResultOtherPacs implements Serializable {
     /**
      * 输出结果（提醒文本）
      */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
     private String output;
 
     /**
      * 期望输出结果（提醒文本）
      */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
     private String expectedOutput;
 
     /**
      * 成功标志（1：成功，0：失败）
      */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
     private Integer success;
 
     /**
      * 提示信息（异常提醒）
      */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
     private String message;
 
     /**

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

@@ -1,8 +1,10 @@
 package com.diagbot.entity;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -40,6 +42,8 @@ public class ResultOtherTransfusion implements Serializable {
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
+    @Excel(name = "测试时间", width = 40, orderNum = "1", format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date gmtModified;
 
     /**
@@ -60,16 +64,19 @@ public class ResultOtherTransfusion implements Serializable {
     /**
      * 其他开单项名称
      */
+    @Excel(name = "实验室检查名称（标准术语）", width = 40, orderNum = "2")
     private String otherItemName;
 
     /**
      * 其他开单项名称（医院端）
      */
+    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "3")
     private String otherItemHisName;
 
     /**
      * 其他开单项名称-细项（医院端）
      */
+    @Excel(name = "实验室检查名称-细项（医院术语）", width = 40, orderNum = "4")
     private String otherItemHisDetailName;
 
     /**
@@ -95,6 +102,7 @@ public class ResultOtherTransfusion implements Serializable {
     /**
      * 输入值
      */
+    @Excel(name = "实验室检查数值", width = 40, orderNum = "5")
     private String otherItemInputValue;
 
     /**
@@ -105,16 +113,19 @@ public class ResultOtherTransfusion implements Serializable {
     /**
      * 禁忌项类型
      */
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "6")
     private String conflictItemType;
 
     /**
      * 禁忌项名称
      */
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "7")
     private String conflictItemName;
 
     /**
      * 禁忌项名称（医院端）
      */
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "8")
     private String conflictItemHisName;
 
     /**
@@ -130,21 +141,25 @@ public class ResultOtherTransfusion implements Serializable {
     /**
      * 输出结果（提醒文本）
      */
+    @Excel(name = "实际结果", width = 80, orderNum = "10")
     private String output;
 
     /**
      * 期望输出结果（提醒文本）
      */
+    @Excel(name = "预期结果", width = 80, orderNum = "11")
     private String expectedOutput;
 
     /**
      * 成功标志（1：成功，0：失败）
      */
+    @Excel(name = "测试结果", width = 20, orderNum = "12", replace = { "失败_0", "成功_1" })
     private Integer success;
 
     /**
      * 提示信息（异常提醒）
      */
+    @Excel(name = "失败原因", width = 80, orderNum = "13")
     private String message;
 
     /**

cdssman-service/src/main/java/com/diagbot/facade/ResultBillFacade.java

@@ -1,8 +1,18 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.ExportBillDTO;
+import com.diagbot.dto.ExportBillTransfusionDTO;
+import com.diagbot.entity.ResultBill;
 import com.diagbot.service.impl.ResultBillServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.vo.ResultBillPageVO;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +20,24 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResultBillFacade extends ResultBillServiceImpl {
+
+    /**
+     * 数据导出
+     *
+     * @param response
+     * @param resultBillPageVO
+     */
+    public void exportExcel(HttpServletResponse response, ResultBillPageVO resultBillPageVO) {
+        resultBillPageVO.setSize(-1L);
+        IPage<ResultBill> page = this.getPage(resultBillPageVO);
+        String fileName = "开单合理性规则测试结果导出.xls";
+
+        if (resultBillPageVO.getBillType().equals(1)) {
+            List<ExportBillDTO> records = BeanUtil.listCopyTo(page.getRecords(), ExportBillDTO.class);
+            ExcelUtils.exportExcel(records, null, "sheet1", ExportBillDTO.class, fileName, response, 12.8f);
+        } else if (resultBillPageVO.getBillType().equals(2)) {
+            List<ExportBillTransfusionDTO> records = BeanUtil.listCopyTo(page.getRecords(), ExportBillTransfusionDTO.class);
+            ExcelUtils.exportExcel(records, null, "sheet1", ExportBillTransfusionDTO.class, fileName, response, 12.8f);
+        }
+    }
 }

cdssman-service/src/main/java/com/diagbot/facade/ResultCriticalFacade.java

@@ -1,8 +1,18 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.ExportCriticalLisDTO;
+import com.diagbot.dto.ExportCriticalPacsDTO;
+import com.diagbot.entity.ResultCritical;
 import com.diagbot.service.impl.ResultCriticalServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.vo.ResultCriticalPageVO;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +20,22 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResultCriticalFacade extends ResultCriticalServiceImpl {
+    /**
+     * 数据导出
+     *
+     * @param response
+     * @param resultCriticalPageVO
+     */
+    public void exportExcel(HttpServletResponse response, ResultCriticalPageVO resultCriticalPageVO) {
+        resultCriticalPageVO.setSize(-1L);
+        IPage<ResultCritical> page = this.getPage(resultCriticalPageVO);
+        String fileName = "危急值规则测试结果导出.xls";
+        if (resultCriticalPageVO.getCriticalType().equals(1)) {
+            List<ExportCriticalLisDTO> records = BeanUtil.listCopyTo(page.getRecords(), ExportCriticalLisDTO.class);
+            ExcelUtils.exportExcel(records, null, "sheet1", ExportCriticalLisDTO.class, fileName, response, 12.8f);
+        } else if (resultCriticalPageVO.getCriticalType().equals(2)) {
+            List<ExportCriticalPacsDTO> records = BeanUtil.listCopyTo(page.getRecords(), ExportCriticalPacsDTO.class);
+            ExcelUtils.exportExcel(records, null, "sheet1", ExportCriticalPacsDTO.class, fileName, response, 12.8f);
+        }
+    }
 }

cdssman-service/src/main/java/com/diagbot/facade/ResultHighriskDrugFacade.java

@@ -1,8 +1,14 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.entity.ResultHighriskDrug;
 import com.diagbot.service.impl.ResultHighriskDrugServiceImpl;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.vo.ResultHighriskDrugPageVO;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +16,16 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResultHighriskDrugFacade extends ResultHighriskDrugServiceImpl {
+    /**
+     * 数据导出
+     *
+     * @param response
+     * @param resultHighriskDrugPageVO
+     */
+    public void exportExcel(HttpServletResponse response, ResultHighriskDrugPageVO resultHighriskDrugPageVO) {
+        resultHighriskDrugPageVO.setSize(-1L);
+        IPage<ResultHighriskDrug> page = this.getPage(resultHighriskDrugPageVO);
+        String fileName = "高危药品规则测试结果导出.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", ResultHighriskDrug.class, fileName, response, 12.8f);
+    }
 }

cdssman-service/src/main/java/com/diagbot/facade/ResultHighriskOperationFacade.java

@@ -1,8 +1,14 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.entity.ResultHighriskOperation;
 import com.diagbot.service.impl.ResultHighriskOperationServiceImpl;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.vo.ResultHighriskOperationPageVO;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +16,16 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResultHighriskOperationFacade extends ResultHighriskOperationServiceImpl {
+    /**
+     * 数据导出
+     *
+     * @param response
+     * @param resultHighriskOperationPageVO
+     */
+    public void exportExcel(HttpServletResponse response, ResultHighriskOperationPageVO resultHighriskOperationPageVO) {
+        resultHighriskOperationPageVO.setSize(-1L);
+        IPage<ResultHighriskOperation> page = this.getPage(resultHighriskOperationPageVO);
+        String fileName = "高危手术规则测试结果导出.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", ResultHighriskOperation.class, fileName, response, 12.8f);
+    }
 }

cdssman-service/src/main/java/com/diagbot/facade/ResultOtherLisFacade.java

@@ -1,8 +1,14 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.entity.ResultOtherLis;
 import com.diagbot.service.impl.ResultOtherLisServiceImpl;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.vo.ResultPageVO;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +16,16 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResultOtherLisFacade extends ResultOtherLisServiceImpl {
+    /**
+     * 数据导出
+     *
+     * @param response
+     * @param resultPageVO
+     */
+    public void exportExcel(HttpServletResponse response, ResultPageVO resultPageVO) {
+        resultPageVO.setSize(-1L);
+        IPage<ResultOtherLis> page = this.getPage(resultPageVO);
+        String fileName = "化验其他值提醒规则测试结果导出.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", ResultOtherLis.class, fileName, response, 12.8f);
+    }
 }

cdssman-service/src/main/java/com/diagbot/facade/ResultOtherPacsFacade.java

@@ -1,8 +1,14 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.entity.ResultOtherPacs;
 import com.diagbot.service.impl.ResultOtherPacsServiceImpl;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.vo.ResultPageVO;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +16,16 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResultOtherPacsFacade extends ResultOtherPacsServiceImpl {
+    /**
+     * 数据导出
+     *
+     * @param response
+     * @param resultPageVO
+     */
+    public void exportExcel(HttpServletResponse response, ResultPageVO resultPageVO) {
+        resultPageVO.setSize(-1L);
+        IPage<ResultOtherPacs> page = this.getPage(resultPageVO);
+        String fileName = "辅检其他值提醒规则测试结果导出.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", ResultOtherPacs.class, fileName, response, 12.8f);
+    }
 }

cdssman-service/src/main/java/com/diagbot/facade/ResultOtherTransfusionFacade.java

@@ -1,8 +1,14 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.entity.ResultOtherTransfusion;
 import com.diagbot.service.impl.ResultOtherTransfusionServiceImpl;
+import com.diagbot.util.ExcelUtils;
+import com.diagbot.vo.ResultPageVO;
 import org.springframework.stereotype.Component;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -10,4 +16,16 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class ResultOtherTransfusionFacade extends ResultOtherTransfusionServiceImpl {
-}
+    /**
+     * 数据导出
+     *
+     * @param response
+     * @param resultPageVO
+     */
+    public void exportExcel(HttpServletResponse response, ResultPageVO resultPageVO) {
+        resultPageVO.setSize(-1L);
+        IPage<ResultOtherTransfusion> page = this.getPage(resultPageVO);
+        String fileName = "输血其他值提醒规则测试结果导出.xls";
+        ExcelUtils.exportExcel(page.getRecords(), null, "sheet1", ResultOtherTransfusion.class, fileName, response, 12.8f);
+    }
+}

cdssman-service/src/main/java/com/diagbot/web/RuleTestController.java

@@ -70,19 +70,6 @@ public class RuleTestController {
     @Autowired
     private ResultOtherTransfusionFacade resultOtherTransfusionFacade;
 
-    /**
-     * 数据导出
-     *
-     * @param response
-     * @param hospitalIdVO
-     */
-    @ApiOperation(value = "导出规则未使用映射关系[by:zhaops]",
-            notes = "")
-    @PostMapping("/exportExcel")
-    @SysLogger("exportExcel")
-    public void exportExcel(HttpServletResponse response, @RequestBody @Valid HospitalIdVO hospitalIdVO) {
-        ruleTestFacade.exportExcel(response, hospitalIdVO);
-    }
 
     @ApiOperation(value = "全规则测试[zhaops]",
             notes = "hospitalId： 医院Id <br>" +
@@ -103,16 +90,8 @@ public class RuleTestController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "开单合理性测试列表[zhaops]",
-            notes = "success： 成功标志（0：失败，1：成功） <br>" +
-                    "resultId： 结果id <br>" +
-                    "billType： 开单项类型（1：通用，2：输血） <br>")
-    @PostMapping("/getResultBillPage")
-    @SysLogger("getResultBillPage")
-    public RespDTO<IPage<ResultBill>> getResultBillPage(@Valid @RequestBody ResultBillPageVO resultBillPageVO) {
-        IPage<ResultBill> data = resultBillFacade.getPage(resultBillPageVO);
-        return RespDTO.onSuc(data);
-    }
+
+    //region --------------------------规则测试------------------------------
 
     @ApiOperation(value = "开单合理性规则测试[zhaops]",
             notes = "hospitalId： 医院Id <br>" +
@@ -130,17 +109,6 @@ public class RuleTestController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "危急值测试列表[zhaops]",
-            notes = "success： 成功标志（0：失败，1：成功） <br>" +
-                    "resultId： 结果id <br>" +
-                    "criticalType： 危急值测试规则类型（1：检验，2：检查） <br>")
-    @PostMapping("/getResultCriticalPage")
-    @SysLogger("getResultCriticalPage")
-    public RespDTO<IPage<ResultCritical>> getResultCriticalPage(@Valid @RequestBody ResultCriticalPageVO resultCriticalPageVO) {
-        IPage<ResultCritical> data = resultCriticalFacade.getPage(resultCriticalPageVO);
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "危急值规则测试[zhaops]",
             notes = "hospitalId： 医院Id <br>" +
                     "caseId： 测试用例id<br>" +
@@ -157,6 +125,67 @@ public class RuleTestController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "高危药品、手术规则测试[zhaops]",
+            notes = "hospitalId： 医院Id <br>" +
+                    "caseId： 测试用例id<br>" +
+                    "highriskType：高危测试规则类型（1：药品，2：手术） <br>")
+    @PostMapping("/highRiskRuleTest")
+    @SysLogger("highRiskRuleTest")
+    public RespDTO<Boolean> highRiskRuleTest(@Valid @RequestBody HighriskRuleVO highriskRuleVO) {
+        Boolean data = false;
+        if (highriskRuleVO.getHighriskType().equals(1)) {
+            data = ruleTestFacade.highriskDrugRuleTest(highriskRuleVO);
+        } else if (highriskRuleVO.getHighriskType().equals(2)) {
+            data = ruleTestFacade.highriskOperationRuleTest(highriskRuleVO);
+        }
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "其他值提醒规则测试[zhaops]",
+            notes = "hospitalId： 医院Id <br>" +
+                    "caseId： 测试用例id<br>" +
+                    "otherType：其他提醒测试规则类型（1：化验，2：辅检，3：输血） <br>")
+    @PostMapping("/otherRuleTest")
+    @SysLogger("otherRuleTest")
+    public RespDTO<Boolean> otherRuleTest(@Valid @RequestBody OtherRuleVO otherRuleVO) {
+        Boolean data = false;
+        if (otherRuleVO.getOtherType().equals(1)) {
+            data = ruleTestFacade.otherLisRuleTest(otherRuleVO);
+        } else if (otherRuleVO.getOtherType().equals(2)) {
+            data = ruleTestFacade.otherPacsRuleTest(otherRuleVO);
+        } else if (otherRuleVO.getOtherType().equals(3)) {
+            data = ruleTestFacade.otherTransfusionRuleTest(otherRuleVO);
+        }
+        return RespDTO.onSuc(data);
+    }
+    //endregion --------------------------规则测试------------------------------
+
+    //region --------------------------分页查询------------------------------
+
+    @ApiOperation(value = "开单合理性测试列表[zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>" +
+                    "billType： 开单项类型（1：通用，2：输血） <br>")
+    @PostMapping("/getResultBillPage")
+    @SysLogger("getResultBillPage")
+    public RespDTO<IPage<ResultBill>> getResultBillPage(@Valid @RequestBody ResultBillPageVO resultBillPageVO) {
+        IPage<ResultBill> data = resultBillFacade.getPage(resultBillPageVO);
+        return RespDTO.onSuc(data);
+    }
+
+
+    @ApiOperation(value = "危急值测试列表[zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>" +
+                    "criticalType： 危急值测试规则类型（1：检验，2：检查） <br>")
+    @PostMapping("/getResultCriticalPage")
+    @SysLogger("getResultCriticalPage")
+    public RespDTO<IPage<ResultCritical>> getResultCriticalPage(@Valid @RequestBody ResultCriticalPageVO resultCriticalPageVO) {
+        IPage<ResultCritical> data = resultCriticalFacade.getPage(resultCriticalPageVO);
+        return RespDTO.onSuc(data);
+    }
+
+
     @ApiOperation(value = "高危药品测试列表[zhaops]",
             notes = "success： 成功标志（0：失败，1：成功） <br>" +
                     "resultId： 结果id <br>")
@@ -177,22 +206,6 @@ public class RuleTestController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "高危药品、手术规则测试[zhaops]",
-            notes = "hospitalId： 医院Id <br>" +
-                    "caseId： 测试用例id<br>" +
-                    "highriskType：高危测试规则类型（1：药品，2：手术） <br>")
-    @PostMapping("/highRiskRuleTest")
-    @SysLogger("highRiskRuleTest")
-    public RespDTO<Boolean> highRiskRuleTest(@Valid @RequestBody HighriskRuleVO highriskRuleVO) {
-        Boolean data = false;
-        if (highriskRuleVO.getHighriskType().equals(1)) {
-            data = ruleTestFacade.highriskDrugRuleTest(highriskRuleVO);
-        } else if (highriskRuleVO.getHighriskType().equals(2)) {
-            data = ruleTestFacade.highriskOperationRuleTest(highriskRuleVO);
-        }
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "其他值提醒（化验）测试列表[zhaops]",
             notes = "success： 成功标志（0：失败，1：成功） <br>" +
                     "resultId： 结果id <br>")
@@ -222,22 +235,82 @@ public class RuleTestController {
         IPage<ResultOtherTransfusion> data = resultOtherTransfusionFacade.getPage(resultPageVO);
         return RespDTO.onSuc(data);
     }
+    //endregion --------------------------分页查询------------------------------
 
-    @ApiOperation(value = "其他值提醒规则测试[zhaops]",
+    //region --------------------------导出------------------------------
+
+    @ApiOperation(value = "导出规则未使用映射关系[by:zhaops]",
+            notes = "")
+    @PostMapping("/exportExcel")
+    @SysLogger("exportExcel")
+    public void exportExcel(HttpServletResponse response, @RequestBody @Valid HospitalIdVO hospitalIdVO) {
+        ruleTestFacade.exportExcel(response, hospitalIdVO);
+    }
+
+    @ApiOperation(value = "开单合理性规则测试结果导出[by:zhaops]",
             notes = "hospitalId： 医院Id <br>" +
                     "caseId： 测试用例id<br>" +
-                    "otherType：其他提醒测试规则类型（1：化验，2：辅检，3：输血） <br>")
-    @PostMapping("/otherRuleTest")
-    @SysLogger("otherRuleTest")
-    public RespDTO<Boolean> otherRuleTest(@Valid @RequestBody OtherRuleVO otherRuleVO) {
-        Boolean data = false;
-        if (otherRuleVO.getOtherType().equals(1)) {
-            data = ruleTestFacade.otherLisRuleTest(otherRuleVO);
-        } else if (otherRuleVO.getOtherType().equals(2)) {
-            data = ruleTestFacade.otherPacsRuleTest(otherRuleVO);
-        } else if (otherRuleVO.getOtherType().equals(3)) {
-            data = ruleTestFacade.otherTransfusionRuleTest(otherRuleVO);
-        }
-        return RespDTO.onSuc(data);
+                    "billType： 开单项测试规则类型（1：通用，2：输血） <br>")
+    @PostMapping("/billExportExcel")
+    @SysLogger("billExportExcel")
+    public void billExportExcel(HttpServletResponse response, @RequestBody @Valid ResultBillPageVO resultBillPageVO) {
+        resultBillFacade.exportExcel(response, resultBillPageVO);
+    }
+
+    @ApiOperation(value = "危急值规则测试结果导出[by:zhaops]",
+            notes = "hospitalId： 医院Id <br>" +
+                    "caseId： 测试用例id<br>" +
+                    "criticalType： 危急值测试规则类型（1：检验，2：检查） <br>")
+    @PostMapping("/criticalExportExcel")
+    @SysLogger("criticalExportExcel")
+    public void criticalExportExcel(HttpServletResponse response, @RequestBody @Valid ResultCriticalPageVO resultCriticalPageVO) {
+        resultCriticalFacade.exportExcel(response, resultCriticalPageVO);
+    }
+
+    @ApiOperation(value = "高危药品规则测试结果导出[by:zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>")
+    @PostMapping("/highriskDrugExportExcel")
+    @SysLogger("highriskDrugExportExcel")
+    public void highriskDrugExportExcel(HttpServletResponse response, @RequestBody @Valid ResultHighriskDrugPageVO resultHighriskDrugPageVO) {
+        resultHighriskDrugFacade.exportExcel(response, resultHighriskDrugPageVO);
+    }
+
+    @ApiOperation(value = "高危手术规则测试结果导出[by:zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>")
+    @PostMapping("/highriskOperationExportExcel")
+    @SysLogger("highriskOperationExportExcel")
+    public void highriskOperationExportExcel(HttpServletResponse response, @RequestBody @Valid ResultHighriskOperationPageVO resultHighriskOperationPageVO) {
+        resultHighriskOperationFacade.exportExcel(response, resultHighriskOperationPageVO);
+    }
+
+    @ApiOperation(value = "化验其他提醒规则测试结果导出[by:zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>")
+    @PostMapping("/otherLisExportExcel")
+    @SysLogger("otherLisExportExcel")
+    public void otherLisExportExcel(HttpServletResponse response, @RequestBody @Valid ResultPageVO resultPageVO) {
+        resultOtherLisFacade.exportExcel(response, resultPageVO);
     }
+
+    @ApiOperation(value = "辅检其他提醒规则测试结果导出[by:zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>")
+    @PostMapping("/otherPacsExportExcel")
+    @SysLogger("otherPacsExportExcel")
+    public void otherPacsExportExcel(HttpServletResponse response, @RequestBody @Valid ResultPageVO resultPageVO) {
+        resultOtherPacsFacade.exportExcel(response, resultPageVO);
+    }
+
+    @ApiOperation(value = "输血其他提醒规则测试结果导出[by:zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>")
+    @PostMapping("/otherTransfusionExportExcel")
+    @SysLogger("otherTransfusionExportExcel")
+    public void otherTransfusionExportExcel(HttpServletResponse response, @RequestBody @Valid ResultPageVO resultPageVO) {
+        resultOtherTransfusionFacade.exportExcel(response, resultPageVO);
+    }
+
+    //endregion --------------------------导出------------------------------
 }

config-server/src/main/resources/shared/cdssman-service-dev.yml

@@ -84,6 +84,10 @@ mybatis-plus:
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12
+
 imageUrl:
   prefix: http://192.168.2.236:82
 

config-server/src/main/resources/shared/cdssman-service-pre.yml

@@ -84,6 +84,10 @@ mybatis-plus:
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12
+
 imageUrl:
   prefix: http://192.168.2.121:82
 

config-server/src/main/resources/shared/cdssman-service-pro.yml

@@ -84,6 +84,10 @@ mybatis-plus:
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12
+
 imageUrl:
   prefix: http://192.168.2.122:82
 

config-server/src/main/resources/shared/cdssman-service-test.yml

@@ -84,6 +84,10 @@ mybatis-plus:
 #远程调用验证标准词接口时间加长
 hystrix.command.CdssCoreClient#getConceptNames(ConceptVO).execution.isolation.thread.timeoutInMilliseconds: 3600000
 
+io.github.lvyahui8.spring:
+  base-packages: com.diagbot.aggregate
+  thread-number: 12
+
 imageUrl:
   prefix: http://192.168.2.241:82