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

cdssman-service/src/main/java/com/diagbot/aggregate/CallIndicationAggregate.java

@@ -0,0 +1,195 @@
+package com.diagbot.aggregate;
+
+import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.BillMsg;
+import com.diagbot.dto.IndicationDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.ResultRule;
+import com.diagbot.facade.MedSearchDataFacade;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.FastJsonUtils;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.IndicationPushVO;
+import com.google.common.collect.Lists;
+import io.github.lvyahui8.spring.annotation.DataConsumer;
+import io.github.lvyahui8.spring.annotation.DataProvider;
+import io.github.lvyahui8.spring.annotation.InvokeParameter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/23 14:55
+ */
+@Component
+@Slf4j
+public class CallIndicationAggregate {
+    @Autowired
+    CdssCoreClient cdssCoreClient;
+    @Autowired
+    MedSearchDataFacade medSearchDataFacade;
+
+    @DataProvider("callIndication")
+    public List<ResultRule> callIndication(
+            @DataConsumer("callIndicationThread1") List<ResultRule> resultlist1,
+            @DataConsumer("callIndicationThread2") List<ResultRule> resultlist2,
+            @DataConsumer("callIndicationThread3") List<ResultRule> resultlist3,
+            @DataConsumer("callIndicationThread4") List<ResultRule> resultlist4) {
+
+        List<ResultRule> retList = Lists.newLinkedList();
+        if (ListUtil.isNotEmpty(resultlist1)) {
+            retList.addAll(resultlist1);
+        }
+        if (ListUtil.isNotEmpty(resultlist2)) {
+            retList.addAll(resultlist2);
+        }
+        if (ListUtil.isNotEmpty(resultlist3)) {
+            retList.addAll(resultlist3);
+        }
+        if (ListUtil.isNotEmpty(resultlist4)) {
+            retList.addAll(resultlist4);
+        }
+        return retList;
+    }
+
+    @DataProvider("callIndicationThread1")
+    public List<ResultRule> callIndicationThread1(@InvokeParameter("threadList1") List<ResultRule> threadList1,
+                                                  @InvokeParameter("hospitalId") Long hospitalId) {
+        return callIndicationExe(threadList1, hospitalId);
+    }
+
+    @DataProvider("callIndicationThread2")
+    public List<ResultRule> callIndicationThread2(@InvokeParameter("threadList2") List<ResultRule> threadList2,
+                                                  @InvokeParameter("hospitalId") Long hospitalId) {
+        return callIndicationExe(threadList2, hospitalId);
+    }
+
+    @DataProvider("callIndicationThread3")
+    public List<ResultRule> callIndicationThread3(@InvokeParameter("threadList3") List<ResultRule> threadList3,
+                                                  @InvokeParameter("hospitalId") Long hospitalId) {
+        return callIndicationExe(threadList3, hospitalId);
+    }
+
+    @DataProvider("callIndicationThread4")
+    public List<ResultRule> callIndicationThread4(@InvokeParameter("threadList4") List<ResultRule> threadList4,
+                                                  @InvokeParameter("hospitalId") Long hospitalId) {
+        return callIndicationExe(threadList4, hospitalId);
+    }
+
+    /**
+     * 开单合理性远程调用接口
+     *
+     * @param list
+     * @param hospitalId
+     * @return
+     */
+    public List<ResultRule> callIndicationExe(List<ResultRule> list, Long hospitalId) {
+        List<ResultRule> retList = Lists.newLinkedList();
+        if (ListUtil.isEmpty(list)) {
+            return retList;
+        }
+        Map<Long, List<ResultRule>> ruleMap = list
+                .stream()
+                .collect(Collectors.groupingBy(ResultRule::getRuleOrderNo));
+        for (Map.Entry<Long, List<ResultRule>> entry : ruleMap.entrySet()) {
+
+            if (entry.getValue().get(0).getSuccess() != null
+                    && entry.getValue().get(0).getSuccess().equals(0)) {
+                retList.addAll(entry.getValue());
+                continue;
+            }
+
+            Integer ruleType = entry.getValue().get(0).getRuleType();
+            IndicationPushVO indicationPushVO = medSearchDataFacade.createBillVO(entry.getValue(), hospitalId);
+
+            //入参
+            entry.getValue().forEach(result -> {
+                result.setInputParams(FastJsonUtils.getBeanToJson(indicationPushVO));
+            });
+
+            RespDTO<IndicationDTO> respDTO = cdssCoreClient.indication(indicationPushVO);
+            if (RespDTOUtil.respIsOK(respDTO)) {
+                IndicationDTO data = respDTO.data;
+                //出参
+                entry.getValue().forEach(result -> {
+                    result.setOutputParams(FastJsonUtils.getBeanToJson(respDTO.data));
+                });
+                List<BillMsg> msgList = Lists.newLinkedList();
+                switch (ruleType) {
+                    case 1:
+                    case 6:
+                        msgList = data.getBillMsgList();
+                        break;
+                    case 2:
+                        msgList = data.getHighRiskList();
+                        break;
+                    case 3:
+                        msgList = data.getCriticalValList();
+                        break;
+                    case 4:
+                    case 5:
+                        msgList = data.getOtherList();
+                        break;
+                    default:
+                        break;
+                }
+
+                if (ListUtil.isEmpty(msgList)) {
+                    entry.getValue().forEach(result -> {
+                        result.setSuccess(0);
+                        result.setMessage("提醒信息未出现");
+                        retList.add(result);
+                    });
+                    continue;
+                }
+
+                Boolean success = false;
+                for (BillMsg msg : msgList) {
+                    if (!msg.getMsg().equals(entry.getValue().get(0).getExpectedOutput())) {
+                        continue;
+                    } else {
+                        success = true;
+                    }
+                    for (ResultRule result : entry.getValue()) {
+                        ResultRule saveResult = new ResultRule();
+                        BeanUtil.copyProperties(result, saveResult);
+                        saveResult.setOutput(msg.getMsg());
+                        if (saveResult.getOutput().equals(saveResult.getExpectedOutput())) {
+                            saveResult.setSuccess(1);
+                        } else {
+                            saveResult.setSuccess(0);
+                            saveResult.setMessage("提示内容与预期不符");
+                        }
+                        retList.add(saveResult);
+                    }
+                }
+                if (!success) {
+                    for (ResultRule result : entry.getValue()) {
+                        Integer count = 1;
+                        result.setSuccess(0);
+                        result.setMessage(result.getMessage() + "提示内容（"
+                                + (count++) + "、"
+                                + msgList.stream().map(i -> i.getMsg()).collect(Collectors.joining("；" + (count++) + "、"))
+                                + "）与预期不符");
+                        retList.add(result);
+                    }
+                }
+            } else {
+                for (ResultRule result : entry.getValue()) {
+                    result.setInputParams(FastJsonUtils.getBeanToJson(indicationPushVO));
+                    result.setSuccess(0);
+                    result.setMessage("远程调用推理接口失败");
+                    retList.add(result);
+                }
+            }
+        }
+        return retList;
+    }
+}

cdssman-service/src/main/java/com/diagbot/aggregate/RuleTestAggregate.java

@@ -1,26 +1,20 @@
 package com.diagbot.aggregate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.client.CdssCoreClient;
-import com.diagbot.dto.BillMsg;
-import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ResultInfo;
 import com.diagbot.entity.ResultRule;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.facade.MedRuleConvertFacade;
-import com.diagbot.facade.MedSearchDataFacade;
 import com.diagbot.facade.RunningInfoFacade;
 import com.diagbot.service.ResultInfoService;
 import com.diagbot.service.ResultRuleService;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.FastJsonUtils;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
-import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.RuleTestVO;
 import com.diagbot.vo.RunningInfoVO;
 import com.google.common.collect.Lists;
+import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import io.github.lvyahui8.spring.annotation.DataConsumer;
 import io.github.lvyahui8.spring.annotation.DataProvider;
 import io.github.lvyahui8.spring.annotation.InvokeParameter;
@@ -31,6 +25,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,8 +38,6 @@ import java.util.stream.Collectors;
 @Component
 @Slf4j
 public class RuleTestAggregate {
-    @Autowired
-    private CdssCoreClient cdssCoreClient;
     @Autowired
     @Qualifier("resultRuleServiceImpl")
     private ResultRuleService resultRuleService;
@@ -56,7 +49,7 @@ public class RuleTestAggregate {
     @Autowired
     private MedRuleConvertFacade medRuleConvertFacade;
     @Autowired
-    private MedSearchDataFacade medSearchDataFacade;
+    private DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
 
     @DataProvider("ruleTest")
     public Boolean ruleTest(
@@ -231,7 +224,6 @@ public class RuleTestAggregate {
         return true;
     }
 
-
     /**
      * 开单合理性远程调用接口
      *
@@ -244,101 +236,48 @@ public class RuleTestAggregate {
         if (ListUtil.isEmpty(list)) {
             return retList;
         }
+
         Map<Long, List<ResultRule>> ruleMap = list
                 .stream()
                 .collect(Collectors.groupingBy(ResultRule::getRuleOrderNo));
-        for (Map.Entry<Long, List<ResultRule>> entry : ruleMap.entrySet()) {
-
-            if (entry.getValue().get(0).getSuccess() != null
-                    && entry.getValue().get(0).getSuccess().equals(0)) {
-                retList.addAll(entry.getValue());
-                continue;
-            }
-
-            Integer ruleType = entry.getValue().get(0).getRuleType();
-            IndicationPushVO indicationPushVO = medSearchDataFacade.createBillVO(entry.getValue(),hospitalId);
-
-            //入参
-            entry.getValue().forEach(result -> {
-                result.setInputParams(FastJsonUtils.getBeanToJson(indicationPushVO));
-            });
-
-            RespDTO<IndicationDTO> respDTO = cdssCoreClient.indication(indicationPushVO);
-            if (RespDTOUtil.respIsOK(respDTO)) {
-                IndicationDTO data = respDTO.data;
-                //出参
-                entry.getValue().forEach(result -> {
-                    result.setOutputParams(FastJsonUtils.getBeanToJson(respDTO.data));
-                });
-                List<BillMsg> msgList = Lists.newLinkedList();
-                switch (ruleType) {
-                    case 1:
-                    case 6:
-                        msgList = data.getBillMsgList();
-                        break;
-                    case 2:
-                        msgList = data.getHighRiskList();
-                        break;
-                    case 3:
-                        msgList = data.getCriticalValList();
-                        break;
-                    case 4:
-                    case 5:
-                        msgList = data.getOtherList();
-                        break;
-                    default:
-                        break;
-                }
-
-                if (ListUtil.isEmpty(msgList)) {
-                    entry.getValue().forEach(result -> {
-                        result.setSuccess(0);
-                        result.setMessage("提醒信息未出现");
-                        retList.add(result);
-                    });
-                    continue;
-                }
 
-                Boolean success = false;
-                for (BillMsg msg : msgList) {
-                    if (!msg.getMsg().equals(entry.getValue().get(0).getExpectedOutput())) {
-                        continue;
-                    } else {
-                        success = true;
-                    }
-                    for (ResultRule result : entry.getValue()) {
-                        ResultRule saveResult = new ResultRule();
-                        BeanUtil.copyProperties(result, saveResult);
-                        saveResult.setOutput(msg.getMsg());
-                        if (saveResult.getOutput().equals(saveResult.getExpectedOutput())) {
-                            saveResult.setSuccess(1);
-                        } else {
-                            saveResult.setSuccess(0);
-                            saveResult.setMessage("提示内容与预期不符");
-                        }
-                        retList.add(saveResult);
-                    }
-                }
-                if (!success) {
-                    for (ResultRule result : entry.getValue()) {
-                        Integer count = 1;
-                        result.setSuccess(0);
-                        result.setMessage(result.getMessage() + "提示内容（"
-                                + (count++) + "、"
-                                + msgList.stream().map(i -> i.getMsg()).collect(Collectors.joining("；" + (count++) + "、"))
-                                + "）与预期不符");
-                        retList.add(result);
-                    }
-                }
-            } else {
-                for (ResultRule result : entry.getValue()) {
-                    result.setInputParams(FastJsonUtils.getBeanToJson(indicationPushVO));
-                    result.setSuccess(0);
-                    result.setMessage("远程调用推理接口失败");
-                    retList.add(result);
+        List<ResultRule> threadList1 = Lists.newLinkedList();
+        List<ResultRule> threadList2 = Lists.newLinkedList();
+        List<ResultRule> threadList3 = Lists.newLinkedList();
+        List<ResultRule> threadList4 = Lists.newLinkedList();
+
+        if (ruleMap.size() >= 100) {
+            Integer averageNum = ruleMap.size() / 4;
+            Integer count = 0;
+            for (Map.Entry<Long, List<ResultRule>> entry : ruleMap.entrySet()) {
+                count++;
+                if (count < averageNum) {
+                    threadList1.addAll(entry.getValue());
+                } else if (count >= averageNum && count < averageNum * 2) {
+                    threadList2.addAll(entry.getValue());
+                } else if (count >= averageNum * 2 && count < averageNum * 3) {
+                    threadList3.addAll(entry.getValue());
+                } else if (count >= averageNum * 3) {
+                    threadList4.addAll(entry.getValue());
                 }
             }
+        } else {
+            threadList1.addAll(list);
+        }
+
+        try {
+            Map<String, Object> invokeParams = new HashMap<>();
+            invokeParams.put("threadList1", threadList1);
+            invokeParams.put("threadList2", threadList2);
+            invokeParams.put("threadList3", threadList3);
+            invokeParams.put("threadList4", threadList4);
+            invokeParams.put("hospitalId", hospitalId);
+            retList
+                    = dataBeanAggregateQueryFacade.get("callIndication", invokeParams, List.class);
+        } catch (Exception e) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);
         }
+
         return retList;
     }
 

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

@@ -1,170 +0,0 @@
-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

@@ -1,169 +0,0 @@
-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

@@ -1,158 +0,0 @@
-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

@@ -1,155 +0,0 @@
-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/dto/KlRuleInfoDTO.java

@@ -29,6 +29,8 @@ public class KlRuleInfoDTO {
      */
     private String modifier;
 
+    private String modifierName;
+
     /**
      * 提示概念id
      */

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

@@ -1,7 +1,9 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -85,6 +87,7 @@ public class DrugConfig implements Serializable {
      * 剂型
      */
     @Excel(name = "药品剂型", width = 60, orderNum = "3", isImportField = "true")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String form;
 
     public Long getId() {

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

@@ -1,7 +1,9 @@
 package com.diagbot.entity;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -72,6 +74,7 @@ public class LisConfig implements Serializable {
      * 检验细项
      */
     @Excel(name = "检验细项", width = 40, orderNum = "2", isImportField = "true")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String hisDetailName;
 
     /**

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

@@ -1,448 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author zhaops
- * @since 2021-01-11
- */
-@TableName("test_result_bill")
-public class ResultBill implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 测试结果id
-     */
-    private Long resultId;
-
-    /**
-     * 开单类型（1：通用，2：输血）
-     */
-    private Integer billType;
-
-    /**
-     * 开单项类型（编码）
-     */
-    private Integer billItemTypeCode;
-    /**
-     * 开单项类型
-     */
-    private String billItemType;
-
-    /**
-     * 开单项名称
-     */
-    private String billItemName;
-
-    /**
-     * 开单项名称（医院端）
-     */
-    private String billItemHisName;
-
-    /**
-     * 开单项名称-细项（医院端）
-     */
-    private String billItemHisDetailName;
-
-    /**
-     *
-     */
-    private Integer conflictType;
-
-    /**
-     * 禁忌项类型（编码）
-     */
-    private Integer conflictItemTypeCode;
-    /**
-     * 禁忌项类型
-     */
-    private String conflictItemType;
-
-    /**
-     * 禁忌项名称
-     */
-    private String conflictItemName;
-
-    /**
-     * 禁忌项名称（医院端）
-     */
-    private String conflictItemHisName;
-
-    /**
-     * 禁忌项名称-细项（医院端）
-     */
-    private String conflictItemHisDetailName;
-
-    /**
-     * 输入值（文本/数值）
-     */
-    private String inputValue;
-
-    /**
-     * 参考值
-     */
-    private String referenceValue;
-
-    /**
-     * 参考值（最大值）
-     */
-    private BigDecimal maxValue;
-
-    /**
-     * 参考值（最小值）
-     */
-    private BigDecimal minValue;
-
-    /**
-     * 单位
-     */
-    private String unit;
-
-    /**
-     * 范围（0：范围内，1：范围外）
-     */
-    private Integer conflictItemRange;
-
-    /**
-     * 输出结果（提醒文本）
-     */
-    private String output;
-
-    /**
-     * 期望输出结果（提醒文本）
-     */
-    private String expectedOutput;
-
-    /**
-     * 成功标志（1：成功，0：失败）
-     */
-    private Integer success;
-
-    /**
-     * 提示信息（异常提醒）
-     */
-    private String message;
-
-    /**
-     * 模拟入参
-     */
-    private String inputParams;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(Long resultId) {
-        this.resultId = resultId;
-    }
-
-    public Integer getBillType() {
-        return billType;
-    }
-
-    public void setBillType(Integer billType) {
-        this.billType = billType;
-    }
-
-    public Integer getBillItemTypeCode() {
-        return billItemTypeCode;
-    }
-
-    public void setBillItemTypeCode(Integer billItemTypeCode) {
-        this.billItemTypeCode = billItemTypeCode;
-    }
-
-    public String getBillItemType() {
-        return billItemType;
-    }
-
-    public void setBillItemType(String billItemType) {
-        this.billItemType = billItemType;
-    }
-
-    public String getBillItemName() {
-        return billItemName;
-    }
-
-    public void setBillItemName(String billItemName) {
-        this.billItemName = billItemName;
-    }
-
-    public String getBillItemHisName() {
-        return billItemHisName;
-    }
-
-    public void setBillItemHisName(String billItemHisName) {
-        this.billItemHisName = billItemHisName;
-    }
-
-    public String getBillItemHisDetailName() {
-        return billItemHisDetailName;
-    }
-
-    public void setBillItemHisDetailName(String billItemHisDetailName) {
-        this.billItemHisDetailName = billItemHisDetailName;
-    }
-
-    public Integer getConflictType() {
-        return conflictType;
-    }
-
-    public void setConflictType(Integer conflictType) {
-        this.conflictType = conflictType;
-    }
-
-    public Integer getConflictItemTypeCode() {
-        return conflictItemTypeCode;
-    }
-
-    public void setConflictItemTypeCode(Integer conflictItemTypeCode) {
-        this.conflictItemTypeCode = conflictItemTypeCode;
-    }
-
-    public String getConflictItemType() {
-        return conflictItemType;
-    }
-
-    public void setConflictItemType(String conflictItemType) {
-        this.conflictItemType = conflictItemType;
-    }
-
-    public String getConflictItemName() {
-        return conflictItemName;
-    }
-
-    public void setConflictItemName(String conflictItemName) {
-        this.conflictItemName = conflictItemName;
-    }
-
-    public String getConflictItemHisName() {
-        return conflictItemHisName;
-    }
-
-    public void setConflictItemHisName(String conflictItemHisName) {
-        this.conflictItemHisName = conflictItemHisName;
-    }
-
-    public String getConflictItemHisDetailName() {
-        return conflictItemHisDetailName;
-    }
-
-    public void setConflictItemHisDetailName(String conflictItemHisDetailName) {
-        this.conflictItemHisDetailName = conflictItemHisDetailName;
-    }
-
-    public String getInputValue() {
-        return inputValue;
-    }
-
-    public void setInputValue(String inputValue) {
-        this.inputValue = inputValue;
-    }
-
-    public String getReferenceValue() {
-        return referenceValue;
-    }
-
-    public void setReferenceValue(String referenceValue) {
-        this.referenceValue = referenceValue;
-    }
-
-    public BigDecimal getMaxValue() {
-        return maxValue;
-    }
-
-    public void setMaxValue(BigDecimal maxValue) {
-        this.maxValue = maxValue;
-    }
-
-    public BigDecimal getMinValue() {
-        return minValue;
-    }
-
-    public void setMinValue(BigDecimal minValue) {
-        this.minValue = minValue;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public Integer getConflictItemRange() {
-        return conflictItemRange;
-    }
-
-    public void setConflictItemRange(Integer conflictItemRange) {
-        this.conflictItemRange = conflictItemRange;
-    }
-
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-
-    public String getExpectedOutput() {
-        return expectedOutput;
-    }
-
-    public void setExpectedOutput(String expectedOutput) {
-        this.expectedOutput = expectedOutput;
-    }
-
-    public Integer getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Integer success) {
-        this.success = success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getInputParams() {
-        return inputParams;
-    }
-
-    public void setInputParams(String inputParams) {
-        this.inputParams = inputParams;
-    }
-
-    @Override
-    public String toString() {
-        return "ResultBill{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", resultId=" + resultId +
-                ", billType=" + billType +
-                ", billItemTypeCode=" + billItemTypeCode +
-                ", billItemType=" + billItemType +
-                ", billItemName=" + billItemName +
-                ", billItemHisName=" + billItemHisName +
-                ", billItemHisDetailName=" + billItemHisDetailName +
-                ", conflictType=" + conflictType +
-                ", conflictItemTypeCode=" + conflictItemTypeCode +
-                ", conflictItemType=" + conflictItemType +
-                ", conflictItemName=" + conflictItemName +
-                ", conflictItemHisName=" + conflictItemHisName +
-                ", conflictItemHisDetailName=" + conflictItemHisDetailName +
-                ", inputValue=" + inputValue +
-                ", referenceValue=" + referenceValue +
-                ", maxValue=" + maxValue +
-                ", minValue=" + minValue +
-                ", unit=" + unit +
-                ", conflictItemRange=" + conflictItemRange +
-                ", output=" + output +
-                ", expectedOutput=" + expectedOutput +
-                ", success=" + success +
-                ", message=" + message +
-                ", inputParams" + inputParams +
-                "}";
-    }
-}

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

@@ -1,356 +0,0 @@
-package com.diagbot.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2021-01-14
- */
-@TableName("test_result_critical")
-public class ResultCritical implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 是否删除,N:未删除，Y:删除
-     */
-    private String isDeleted;
-
-    /**
-     * 记录创建时间
-     */
-    private Date gmtCreate;
-
-    /**
-     * 记录修改时间,如果时间是1970年则表示纪录未修改
-     */
-    private Date gmtModified;
-
-    /**
-     * 创建人，0表示无创建人值
-     */
-    private String creator;
-
-    /**
-     * 修改人,如果为0则表示纪录未修改
-     */
-    private String modifier;
-
-    /**
-     * 测试结果id
-     */
-    private Long resultId;
-
-    /**
-     * 危机值开单项类型（1：实验室检查、2：辅助检查）
-     */
-    private Integer criticalType;
-
-    /**
-     * 开单项类型
-     */
-    private String criticalItemType;
-
-    /**
-     * 开单项名称
-     */
-    private String criticalItemName;
-
-    /**
-     * 开单项名称（医院端）
-     */
-    private String criticalItemHisName;
-
-    /**
-     * 开单项名称-细项（医院端）
-     */
-    private String criticalItemHisDetailName;
-
-    /**
-     * 输入值（文本/数值）
-     */
-    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;
-
-    /**
-     * 输出结果（提醒文本）
-     */
-    private String output;
-
-    /**
-     * 期望输出结果（提醒文本）
-     */
-    private String expectedOutput;
-
-    /**
-     * 成功标志（1：成功，0：失败）
-     */
-    private Integer success;
-
-    /**
-     * 提示信息（异常提醒）
-     */
-    private String message;
-
-    /**
-     * 模拟入参
-     */
-    private String inputParams;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(Long resultId) {
-        this.resultId = resultId;
-    }
-    public Integer getCriticalType() {
-        return criticalType;
-    }
-
-    public void setCriticalType(Integer criticalType) {
-        this.criticalType = criticalType;
-    }
-    public String getCriticalItemType() {
-        return criticalItemType;
-    }
-
-    public void setCriticalItemType(String criticalItemType) {
-        this.criticalItemType = criticalItemType;
-    }
-    public String getCriticalItemName() {
-        return criticalItemName;
-    }
-
-    public void setCriticalItemName(String criticalItemName) {
-        this.criticalItemName = criticalItemName;
-    }
-    public String getCriticalItemHisName() {
-        return criticalItemHisName;
-    }
-
-    public void setCriticalItemHisName(String criticalItemHisName) {
-        this.criticalItemHisName = criticalItemHisName;
-    }
-    public String getCriticalItemHisDetailName() {
-        return criticalItemHisDetailName;
-    }
-
-    public void setCriticalItemHisDetailName(String criticalItemHisDetailName) {
-        this.criticalItemHisDetailName = criticalItemHisDetailName;
-    }
-    public String getInputValue() {
-        return inputValue;
-    }
-
-    public void setInputValue(String inputValue) {
-        this.inputValue = inputValue;
-    }
-    public String getReferenceValue() {
-        return referenceValue;
-    }
-
-    public void setReferenceValue(String referenceValue) {
-        this.referenceValue = referenceValue;
-    }
-    public Integer getCriticalItemRange() {
-        return criticalItemRange;
-    }
-
-    public void setCriticalItemRange(Integer criticalItemRange) {
-        this.criticalItemRange = criticalItemRange;
-    }
-    public BigDecimal getMinValue() {
-        return minValue;
-    }
-
-    public void setMinValue(BigDecimal minValue) {
-        this.minValue = minValue;
-    }
-    public BigDecimal getMaxValue() {
-        return maxValue;
-    }
-
-    public void setMaxValue(BigDecimal maxValue) {
-        this.maxValue = maxValue;
-    }
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-    public Integer getMinAge() {
-        return minAge;
-    }
-
-    public void setMinAge(Integer minAge) {
-        this.minAge = minAge;
-    }
-    public Integer getMaxAge() {
-        return maxAge;
-    }
-
-    public void setMaxAge(Integer maxAge) {
-        this.maxAge = maxAge;
-    }
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-    public String getExpectedOutput() {
-        return expectedOutput;
-    }
-
-    public void setExpectedOutput(String expectedOutput) {
-        this.expectedOutput = expectedOutput;
-    }
-    public Integer getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Integer success) {
-        this.success = success;
-    }
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-    public String getInputParams() {
-        return inputParams;
-    }
-
-    public void setInputParams(String inputParams) {
-        this.inputParams = inputParams;
-    }
-
-    @Override
-    public String toString() {
-        return "ResultCritical{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", resultId=" + resultId +
-            ", criticalType=" + criticalType +
-            ", criticalItemType=" + criticalItemType +
-            ", criticalItemName=" + criticalItemName +
-            ", criticalItemHisName=" + criticalItemHisName +
-            ", criticalItemHisDetailName=" + criticalItemHisDetailName +
-            ", inputValue=" + inputValue +
-            ", referenceValue=" + referenceValue +
-            ", criticalItemRange=" + criticalItemRange +
-            ", minValue=" + minValue +
-            ", maxValue=" + maxValue +
-            ", unit=" + unit +
-            ", minAge=" + minAge +
-            ", maxAge=" + maxAge +
-            ", output=" + output +
-            ", expectedOutput=" + expectedOutput +
-            ", success=" + success +
-            ", message=" + message +
-            ", inputParams=" + inputParams +
-        "}";
-    }
-}

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

@@ -1,252 +0,0 @@
-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;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2021-01-14
- */
-@TableName("test_result_highrisk_drug")
-public class ResultHighriskDrug implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @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;
-
-    @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;
-
-    /**
-     * 模拟入参
-     */
-    private String inputParams;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(Long resultId) {
-        this.resultId = resultId;
-    }
-    public String getHighriskItemName() {
-        return highriskItemName;
-    }
-
-    public void setHighriskItemName(String highriskItemName) {
-        this.highriskItemName = highriskItemName;
-    }
-    public String getHighriskItemRegName() {
-        return highriskItemRegName;
-    }
-
-    public void setHighriskItemRegName(String highriskItemRegName) {
-        this.highriskItemRegName = highriskItemRegName;
-    }
-    public String getHighriskItemHisName() {
-        return highriskItemHisName;
-    }
-
-    public void setHighriskItemHisName(String highriskItemHisName) {
-        this.highriskItemHisName = highriskItemHisName;
-    }
-    public String getHighriskItemForm() {
-        return highriskItemForm;
-    }
-
-    public void setHighriskItemForm(String highriskItemForm) {
-        this.highriskItemForm = highriskItemForm;
-    }
-    public String getHighriskLevel() {
-        return highriskLevel;
-    }
-
-    public void setHighriskLevel(String highriskLevel) {
-        this.highriskLevel = highriskLevel;
-    }
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-    public String getExpectedOutput() {
-        return expectedOutput;
-    }
-
-    public void setExpectedOutput(String expectedOutput) {
-        this.expectedOutput = expectedOutput;
-    }
-    public Integer getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Integer success) {
-        this.success = success;
-    }
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-    public String getInputParams() {
-        return inputParams;
-    }
-
-    public void setInputParams(String inputParams) {
-        this.inputParams = inputParams;
-    }
-
-    @Override
-    public String toString() {
-        return "ResultHighriskDrug{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", resultId=" + resultId +
-            ", highriskItemName=" + highriskItemName +
-            ", highriskItemRegName=" + highriskItemRegName +
-            ", highriskItemHisName=" + highriskItemHisName +
-            ", highriskItemForm=" + highriskItemForm +
-            ", highriskLevel=" + highriskLevel +
-            ", output=" + output +
-            ", expectedOutput=" + expectedOutput +
-            ", success=" + success +
-            ", message=" + message +
-            ", inputParams=" + inputParams +
-        "}";
-    }
-}

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

@@ -1,386 +0,0 @@
-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;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-@TableName("test_result_highrisk_operation")
-public class ResultHighriskOperation implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @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;
-
-    /**
-     * 标准名称
-     */
-    @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;
-
-    /**
-     * 高危条件范围
-     */
-    private Integer factorItemRange;
-
-    /**
-     * 高危条件最小值
-     */
-    private BigDecimal factorItemMinValue;
-
-    /**
-     * 高危条件最大值
-     */
-    private BigDecimal factorItemMaxValue;
-
-    /**
-     * 输入值
-     */
-    @Excel(name = "禁忌项输入值/结果", width = 40, orderNum = "8")
-    private String inputValue;
-
-    /**
-     * 高危条件单位
-     */
-    private String factorItemUnit;
-
-    /**
-     * 是否模糊匹配
-     */
-    private String factorItemExactMatch;
-
-    /**
-     * 高危条件
-     */
-    private String factorItemCond;
-
-    /**
-     * 输出结果（提醒文本）
-     */
-    @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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(Long resultId) {
-        this.resultId = resultId;
-    }
-    public String getHighriskItemName() {
-        return highriskItemName;
-    }
-
-    public void setHighriskItemName(String highriskItemName) {
-        this.highriskItemName = highriskItemName;
-    }
-    public String getHighriskItemHisName() {
-        return highriskItemHisName;
-    }
-
-    public void setHighriskItemHisName(String highriskItemHisName) {
-        this.highriskItemHisName = highriskItemHisName;
-    }
-    public String getLevel() {
-        return level;
-    }
-
-    public void setLevel(String level) {
-        this.level = level;
-    }
-    public String getFactorItemName() {
-        return factorItemName;
-    }
-
-    public void setFactorItemName(String factorItemName) {
-        this.factorItemName = factorItemName;
-    }
-    public String getFactorItemHisName() {
-        return factorItemHisName;
-    }
-
-    public void setFactorItemHisName(String factorItemHisName) {
-        this.factorItemHisName = factorItemHisName;
-    }
-    public String getFactorItemHisDetailName() {
-        return factorItemHisDetailName;
-    }
-
-    public void setFactorItemHisDetailName(String factorItemHisDetailName) {
-        this.factorItemHisDetailName = factorItemHisDetailName;
-    }
-    public String getFactorItemType() {
-        return factorItemType;
-    }
-
-    public void setFactorItemType(String factorItemType) {
-        this.factorItemType = factorItemType;
-    }
-    public Integer getFactorItemRange() {
-        return factorItemRange;
-    }
-
-    public void setFactorItemRange(Integer factorItemRange) {
-        this.factorItemRange = factorItemRange;
-    }
-    public BigDecimal getFactorItemMinValue() {
-        return factorItemMinValue;
-    }
-
-    public void setFactorItemMinValue(BigDecimal factorItemMinValue) {
-        this.factorItemMinValue = factorItemMinValue;
-    }
-    public BigDecimal getFactorItemMaxValue() {
-        return factorItemMaxValue;
-    }
-
-    public void setFactorItemMaxValue(BigDecimal factorItemMaxValue) {
-        this.factorItemMaxValue = factorItemMaxValue;
-    }
-    public String getInputValue() {
-        return inputValue;
-    }
-
-    public void setInputValue(String inputValue) {
-        this.inputValue = inputValue;
-    }
-    public String getFactorItemUnit() {
-        return factorItemUnit;
-    }
-
-    public void setFactorItemUnit(String factorItemUnit) {
-        this.factorItemUnit = factorItemUnit;
-    }
-    public String getFactorItemExactMatch() {
-        return factorItemExactMatch;
-    }
-
-    public void setFactorItemExactMatch(String factorItemExactMatch) {
-        this.factorItemExactMatch = factorItemExactMatch;
-    }
-    public String getFactorItemCond() {
-        return factorItemCond;
-    }
-
-    public void setFactorItemCond(String factorItemCond) {
-        this.factorItemCond = factorItemCond;
-    }
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-    public String getExpectedOutput() {
-        return expectedOutput;
-    }
-
-    public void setExpectedOutput(String expectedOutput) {
-        this.expectedOutput = expectedOutput;
-    }
-    public Integer getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Integer success) {
-        this.success = success;
-    }
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-    public String getInputParams() {
-        return inputParams;
-    }
-
-    public void setInputParams(String inputParams) {
-        this.inputParams = inputParams;
-    }
-
-    @Override
-    public String toString() {
-        return "ResultHighriskOperation{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", resultId=" + resultId +
-            ", highriskItemName=" + highriskItemName +
-            ", highriskItemHisName=" + highriskItemHisName +
-            ", level=" + level +
-            ", factorItemName=" + factorItemName +
-            ", factorItemHisName=" + factorItemHisName +
-            ", factorItemHisDetailName=" + factorItemHisDetailName +
-            ", factorItemType=" + factorItemType +
-            ", factorItemRange=" + factorItemRange +
-            ", factorItemMinValue=" + factorItemMinValue +
-            ", factorItemMaxValue=" + factorItemMaxValue +
-            ", inputValue=" + inputValue +
-            ", factorItemUnit=" + factorItemUnit +
-            ", factorItemExactMatch=" + factorItemExactMatch +
-            ", factorItemCond=" + factorItemCond +
-            ", output=" + output +
-            ", expectedOutput=" + expectedOutput +
-            ", success=" + success +
-            ", message=" + message +
-            ", inputParams=" + inputParams +
-        "}";
-    }
-}

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

@@ -1,385 +0,0 @@
-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;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-@TableName("test_result_other_lis")
-public class ResultOtherLis implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @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;
-
-    /**
-     * 其他开单项类型
-     */
-    private String otherItemType;
-
-    /**
-     * 其他开单项名称
-     */
-    @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;
-
-    /**
-     * 范围（0：范围内，1：范围外）
-     */
-    private Integer otherItemRange;
-
-    /**
-     * 提醒项类型
-     */
-    @Excel(name = "禁忌项类型", width = 40, orderNum = "6")
-    private String remindItemType;
-
-    /**
-     * 提醒项名称
-     */
-    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "7")
-    private String remindItemName;
-
-    /**
-     * 提醒项名称（医院端）
-     */
-    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "8")
-    private String remindItemHisName;
-
-    /**
-     * 提醒项名称-细项（医院端）
-     */
-    private String remindItemHisDetailName;
-
-    /**
-     * 输入值
-     */
-    @Excel(name = "实验室检查数值", width = 40, orderNum = "5")
-    private String inputValue;
-
-    /**
-     * 参考值
-     */
-    private String referenceValue;
-
-    /**
-     * 参考值（最大值）
-     */
-    private BigDecimal maxValue;
-
-    /**
-     * 参考值（最小值）
-     */
-    private BigDecimal minValue;
-
-    /**
-     * 单位
-     */
-    private String unit;
-
-    /**
-     * 输出结果（提醒文本）
-     */
-    @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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(Long resultId) {
-        this.resultId = resultId;
-    }
-    public String getOtherItemType() {
-        return otherItemType;
-    }
-
-    public void setOtherItemType(String otherItemType) {
-        this.otherItemType = otherItemType;
-    }
-    public String getOtherItemName() {
-        return otherItemName;
-    }
-
-    public void setOtherItemName(String otherItemName) {
-        this.otherItemName = otherItemName;
-    }
-    public String getOtherItemHisName() {
-        return otherItemHisName;
-    }
-
-    public void setOtherItemHisName(String otherItemHisName) {
-        this.otherItemHisName = otherItemHisName;
-    }
-    public String getOtherItemHisDetailName() {
-        return otherItemHisDetailName;
-    }
-
-    public void setOtherItemHisDetailName(String otherItemHisDetailName) {
-        this.otherItemHisDetailName = otherItemHisDetailName;
-    }
-    public Integer getOtherItemRange() {
-        return otherItemRange;
-    }
-
-    public void setOtherItemRange(Integer otherItemRange) {
-        this.otherItemRange = otherItemRange;
-    }
-    public String getRemindItemType() {
-        return remindItemType;
-    }
-
-    public void setRemindItemType(String remindItemType) {
-        this.remindItemType = remindItemType;
-    }
-    public String getRemindItemName() {
-        return remindItemName;
-    }
-
-    public void setRemindItemName(String remindItemName) {
-        this.remindItemName = remindItemName;
-    }
-    public String getRemindItemHisName() {
-        return remindItemHisName;
-    }
-
-    public void setRemindItemHisName(String remindItemHisName) {
-        this.remindItemHisName = remindItemHisName;
-    }
-    public String getRemindItemHisDetailName() {
-        return remindItemHisDetailName;
-    }
-
-    public void setRemindItemHisDetailName(String remindItemHisDetailName) {
-        this.remindItemHisDetailName = remindItemHisDetailName;
-    }
-    public String getInputValue() {
-        return inputValue;
-    }
-
-    public void setInputValue(String inputValue) {
-        this.inputValue = inputValue;
-    }
-    public String getReferenceValue() {
-        return referenceValue;
-    }
-
-    public void setReferenceValue(String referenceValue) {
-        this.referenceValue = referenceValue;
-    }
-    public BigDecimal getMaxValue() {
-        return maxValue;
-    }
-
-    public void setMaxValue(BigDecimal maxValue) {
-        this.maxValue = maxValue;
-    }
-    public BigDecimal getMinValue() {
-        return minValue;
-    }
-
-    public void setMinValue(BigDecimal minValue) {
-        this.minValue = minValue;
-    }
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-    public String getExpectedOutput() {
-        return expectedOutput;
-    }
-
-    public void setExpectedOutput(String expectedOutput) {
-        this.expectedOutput = expectedOutput;
-    }
-    public Integer getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Integer success) {
-        this.success = success;
-    }
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-    public String getInputParams() {
-        return inputParams;
-    }
-
-    public void setInputParams(String inputParams) {
-        this.inputParams = inputParams;
-    }
-
-    @Override
-    public String toString() {
-        return "ResultOtherLis{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", resultId=" + resultId +
-            ", otherItemType=" + otherItemType +
-            ", otherItemName=" + otherItemName +
-            ", otherItemHisName=" + otherItemHisName +
-            ", otherItemHisDetailName=" + otherItemHisDetailName +
-            ", otherItemRange=" + otherItemRange +
-            ", remindItemType=" + remindItemType +
-            ", remindItemName=" + remindItemName +
-            ", remindItemHisName=" + remindItemHisName +
-            ", remindItemHisDetailName=" + remindItemHisDetailName +
-            ", inputValue=" + inputValue +
-            ", referenceValue=" + referenceValue +
-            ", maxValue=" + maxValue +
-            ", minValue=" + minValue +
-            ", unit=" + unit +
-            ", output=" + output +
-            ", expectedOutput=" + expectedOutput +
-            ", success=" + success +
-            ", message=" + message +
-            ", inputParams=" + inputParams +
-        "}";
-    }
-}

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

@@ -1,384 +0,0 @@
-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;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2021-01-20
- */
-@TableName("test_result_other_pacs")
-public class ResultOtherPacs implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @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;
-
-    /**
-     * 辅检描述
-     */
-    private String pacsDescribe;
-
-    /**
-     * 辅检结果
-     */
-    @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;
-
-    /**
-     * 提醒项名称-细项（医院端）
-     */
-    private String remindItemHisDetailName;
-
-    /**
-     * 参考值
-     */
-    private String referenceValue;
-
-    /**
-     * 参考值（最大值）
-     */
-    private BigDecimal maxAge;
-
-    /**
-     * 参考值（最小值）
-     */
-    private BigDecimal minAge;
-
-    /**
-     * 年龄范围（0：范围内，1：范围外）
-     */
-    private Integer ageRange;
-
-    /**
-     * 输入值
-     */
-    @Excel(name = "年龄", width = 40, orderNum = "4")
-    private String inputAge;
-
-    /**
-     * 性别
-     */
-    @Excel(name = "性别", width = 40, orderNum = "3")
-    private String gender;
-
-    /**
-     * 检查结论有
-     */
-    private String postoken;
-
-    /**
-     * 检查结论无
-     */
-    private String negtoken;
-
-    /**
-     * 输出结果（提醒文本）
-     */
-    @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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-    public Long getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(Long resultId) {
-        this.resultId = resultId;
-    }
-    public String getPacsDescribe() {
-        return pacsDescribe;
-    }
-
-    public void setPacsDescribe(String pacsDescribe) {
-        this.pacsDescribe = pacsDescribe;
-    }
-    public String getPacsResult() {
-        return pacsResult;
-    }
-
-    public void setPacsResult(String pacsResult) {
-        this.pacsResult = pacsResult;
-    }
-    public String getRemindItemType() {
-        return remindItemType;
-    }
-
-    public void setRemindItemType(String remindItemType) {
-        this.remindItemType = remindItemType;
-    }
-    public String getRemindItemName() {
-        return remindItemName;
-    }
-
-    public void setRemindItemName(String remindItemName) {
-        this.remindItemName = remindItemName;
-    }
-    public String getRemindItemHisName() {
-        return remindItemHisName;
-    }
-
-    public void setRemindItemHisName(String remindItemHisName) {
-        this.remindItemHisName = remindItemHisName;
-    }
-    public String getRemindItemHisDetailName() {
-        return remindItemHisDetailName;
-    }
-
-    public void setRemindItemHisDetailName(String remindItemHisDetailName) {
-        this.remindItemHisDetailName = remindItemHisDetailName;
-    }
-    public String getReferenceValue() {
-        return referenceValue;
-    }
-
-    public void setReferenceValue(String referenceValue) {
-        this.referenceValue = referenceValue;
-    }
-    public BigDecimal getMaxAge() {
-        return maxAge;
-    }
-
-    public void setMaxAge(BigDecimal maxAge) {
-        this.maxAge = maxAge;
-    }
-    public BigDecimal getMinAge() {
-        return minAge;
-    }
-
-    public void setMinAge(BigDecimal minAge) {
-        this.minAge = minAge;
-    }
-    public Integer getAgeRange() {
-        return ageRange;
-    }
-
-    public void setAgeRange(Integer ageRange) {
-        this.ageRange = ageRange;
-    }
-    public String getInputAge() {
-        return inputAge;
-    }
-
-    public void setInputAge(String inputAge) {
-        this.inputAge = inputAge;
-    }
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-    public String getPostoken() {
-        return postoken;
-    }
-
-    public void setPostoken(String postoken) {
-        this.postoken = postoken;
-    }
-    public String getNegtoken() {
-        return negtoken;
-    }
-
-    public void setNegtoken(String negtoken) {
-        this.negtoken = negtoken;
-    }
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-    public String getExpectedOutput() {
-        return expectedOutput;
-    }
-
-    public void setExpectedOutput(String expectedOutput) {
-        this.expectedOutput = expectedOutput;
-    }
-    public Integer getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Integer success) {
-        this.success = success;
-    }
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-    public String getInputParams() {
-        return inputParams;
-    }
-
-    public void setInputParams(String inputParams) {
-        this.inputParams = inputParams;
-    }
-
-    @Override
-    public String toString() {
-        return "ResultOtherPacs{" +
-            "id=" + id +
-            ", isDeleted=" + isDeleted +
-            ", gmtCreate=" + gmtCreate +
-            ", gmtModified=" + gmtModified +
-            ", creator=" + creator +
-            ", modifier=" + modifier +
-            ", resultId=" + resultId +
-            ", pacsDescribe=" + pacsDescribe +
-            ", pacsResult=" + pacsResult +
-            ", remindItemType=" + remindItemType +
-            ", remindItemName=" + remindItemName +
-            ", remindItemHisName=" + remindItemHisName +
-            ", remindItemHisDetailName=" + remindItemHisDetailName +
-            ", referenceValue=" + referenceValue +
-            ", maxAge=" + maxAge +
-            ", minAge=" + minAge +
-            ", ageRange=" + ageRange +
-            ", inputAge=" + inputAge +
-            ", gender=" + gender +
-            ", postoken=" + postoken +
-            ", negtoken=" + negtoken +
-            ", output=" + output +
-            ", expectedOutput=" + expectedOutput +
-            ", success=" + success +
-            ", message=" + message +
-            ", inputParams=" + inputParams +
-        "}";
-    }
-}

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

@@ -1,465 +0,0 @@
-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;
-import java.util.Date;
-import java.util.Objects;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-@TableName("test_result_other_transfusion")
-public class ResultOtherTransfusion implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @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;
-
-    /**
-     * 其他开单项名称
-     */
-    @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;
-
-    /**
-     * 范围（0：范围内，1：范围外）
-     */
-    private Integer otherItemRange;
-
-    /**
-     * 参考值（最大值）
-     */
-    private BigDecimal otherItemMaxValue;
-
-    /**
-     * 参考值（最小值）
-     */
-    private BigDecimal otherItemMinValue;
-
-    /**
-     * 单位
-     */
-    private String otherItemUnit;
-
-    /**
-     * 输入值
-     */
-    @Excel(name = "实验室检查数值", width = 40, orderNum = "5")
-    private String otherItemInputValue;
-
-    /**
-     * 输注类型
-     */
-    private String transfusionType;
-
-    /**
-     * 输注类型（医院端）
-     */
-    private String transfusionTypeHisName;
-
-    /**
-     * 禁忌项类型
-     */
-    @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;
-
-    /**
-     * 禁忌项名称-细项（医院端）
-     */
-    private String conflictItemHisDetailName;
-
-    /**
-     * 参考值
-     */
-    private String referenceValue;
-
-    /**
-     * 输出结果（提醒文本）
-     */
-    @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;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    public Long getResultId() {
-        return resultId;
-    }
-
-    public void setResultId(Long resultId) {
-        this.resultId = resultId;
-    }
-
-    public String getOtherItemName() {
-        return otherItemName;
-    }
-
-    public void setOtherItemName(String otherItemName) {
-        this.otherItemName = otherItemName;
-    }
-
-    public String getOtherItemHisName() {
-        return otherItemHisName;
-    }
-
-    public void setOtherItemHisName(String otherItemHisName) {
-        this.otherItemHisName = otherItemHisName;
-    }
-
-    public String getOtherItemHisDetailName() {
-        return otherItemHisDetailName;
-    }
-
-    public void setOtherItemHisDetailName(String otherItemHisDetailName) {
-        this.otherItemHisDetailName = otherItemHisDetailName;
-    }
-
-    public Integer getOtherItemRange() {
-        return otherItemRange;
-    }
-
-    public void setOtherItemRange(Integer otherItemRange) {
-        this.otherItemRange = otherItemRange;
-    }
-
-    public BigDecimal getOtherItemMaxValue() {
-        return otherItemMaxValue;
-    }
-
-    public void setOtherItemMaxValue(BigDecimal otherItemMaxValue) {
-        this.otherItemMaxValue = otherItemMaxValue;
-    }
-
-    public BigDecimal getOtherItemMinValue() {
-        return otherItemMinValue;
-    }
-
-    public void setOtherItemMinValue(BigDecimal otherItemMinValue) {
-        this.otherItemMinValue = otherItemMinValue;
-    }
-
-    public String getOtherItemUnit() {
-        return otherItemUnit;
-    }
-
-    public void setOtherItemUnit(String otherItemUnit) {
-        this.otherItemUnit = otherItemUnit;
-    }
-
-    public String getOtherItemInputValue() {
-        return otherItemInputValue;
-    }
-
-    public void setOtherItemInputValue(String otherItemInputValue) {
-        this.otherItemInputValue = otherItemInputValue;
-    }
-
-    public String getTransfusionType() {
-        return transfusionType;
-    }
-
-    public void setTransfusionType(String transfusionType) {
-        this.transfusionType = transfusionType;
-    }
-
-    public String getTransfusionTypeHisName() {
-        return transfusionTypeHisName;
-    }
-
-    public void setTransfusionTypeHisName(String transfusionTypeHisName) {
-        this.transfusionTypeHisName = transfusionTypeHisName;
-    }
-
-    public String getConflictItemType() {
-        return conflictItemType;
-    }
-
-    public void setConflictItemType(String conflictItemType) {
-        this.conflictItemType = conflictItemType;
-    }
-
-    public String getConflictItemName() {
-        return conflictItemName;
-    }
-
-    public void setConflictItemName(String conflictItemName) {
-        this.conflictItemName = conflictItemName;
-    }
-
-    public String getConflictItemHisName() {
-        return conflictItemHisName;
-    }
-
-    public void setConflictItemHisName(String conflictItemHisName) {
-        this.conflictItemHisName = conflictItemHisName;
-    }
-
-    public String getConflictItemHisDetailName() {
-        return conflictItemHisDetailName;
-    }
-
-    public void setConflictItemHisDetailName(String conflictItemHisDetailName) {
-        this.conflictItemHisDetailName = conflictItemHisDetailName;
-    }
-
-    public String getReferenceValue() {
-        return referenceValue;
-    }
-
-    public void setReferenceValue(String referenceValue) {
-        this.referenceValue = referenceValue;
-    }
-
-    public String getOutput() {
-        return output;
-    }
-
-    public void setOutput(String output) {
-        this.output = output;
-    }
-
-    public String getExpectedOutput() {
-        return expectedOutput;
-    }
-
-    public void setExpectedOutput(String expectedOutput) {
-        this.expectedOutput = expectedOutput;
-    }
-
-    public Integer getSuccess() {
-        return success;
-    }
-
-    public void setSuccess(Integer success) {
-        this.success = success;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getInputParams() {
-        return inputParams;
-    }
-
-    public void setInputParams(String inputParams) {
-        this.inputParams = inputParams;
-    }
-
-    @Override
-    public String toString() {
-        return "ResultOtherTransfusion{" +
-                "id=" + id +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                ", resultId=" + resultId +
-                ", otherItemName=" + otherItemName +
-                ", otherItemHisName=" + otherItemHisName +
-                ", otherItemHisDetailName=" + otherItemHisDetailName +
-                ", otherItemRange=" + otherItemRange +
-                ", otherItemMaxValue=" + otherItemMaxValue +
-                ", otherItemMinValue=" + otherItemMinValue +
-                ", otherItemUnit=" + otherItemUnit +
-                ", otherItemInputValue=" + otherItemInputValue +
-                ", transfusionType=" + transfusionType +
-                ", transfusionTypeHisName=" + transfusionTypeHisName +
-                ", conflictItemType=" + conflictItemType +
-                ", conflictItemName=" + conflictItemName +
-                ", conflictItemHisName=" + conflictItemHisName +
-                ", conflictItemHisDetailName=" + conflictItemHisDetailName +
-                ", referenceValue=" + referenceValue +
-                ", output=" + output +
-                ", expectedOutput=" + expectedOutput +
-                ", success=" + success +
-                ", message=" + message +
-                ", inputParams=" + inputParams +
-                "}";
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        ResultOtherTransfusion resultOtherTransfusion = (ResultOtherTransfusion) o;
-        return Objects.equals(id, resultOtherTransfusion.id)
-                && Objects.equals(isDeleted, resultOtherTransfusion.isDeleted)
-                && Objects.equals(resultId, resultOtherTransfusion.resultId)
-                && Objects.equals(otherItemName, resultOtherTransfusion.otherItemName)
-                && Objects.equals(otherItemHisName, resultOtherTransfusion.otherItemHisName)
-                && Objects.equals(otherItemHisDetailName, resultOtherTransfusion.otherItemHisDetailName)
-                && Objects.equals(otherItemRange, resultOtherTransfusion.otherItemRange)
-                && Objects.equals(otherItemMaxValue, resultOtherTransfusion.otherItemMaxValue)
-                && Objects.equals(otherItemMinValue, resultOtherTransfusion.otherItemMinValue)
-                && Objects.equals(otherItemUnit, resultOtherTransfusion.otherItemUnit)
-                && Objects.equals(otherItemInputValue, resultOtherTransfusion.otherItemInputValue)
-                && Objects.equals(transfusionType, resultOtherTransfusion.transfusionType)
-                && Objects.equals(transfusionTypeHisName, resultOtherTransfusion.transfusionTypeHisName)
-                && Objects.equals(conflictItemType, resultOtherTransfusion.conflictItemType)
-                && Objects.equals(conflictItemName, resultOtherTransfusion.conflictItemName)
-                && Objects.equals(conflictItemHisName, resultOtherTransfusion.conflictItemHisName)
-                && Objects.equals(conflictItemHisDetailName, resultOtherTransfusion.conflictItemHisDetailName)
-                && Objects.equals(referenceValue, resultOtherTransfusion.referenceValue)
-                && Objects.equals(output, resultOtherTransfusion.output)
-                && Objects.equals(expectedOutput, resultOtherTransfusion.expectedOutput)
-                && Objects.equals(success, resultOtherTransfusion.success)
-                && Objects.equals(message, resultOtherTransfusion.message)
-                && Objects.equals(inputParams, resultOtherTransfusion.inputParams);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, isDeleted, resultId, otherItemName, otherItemHisName, otherItemHisDetailName,
-                otherItemRange, otherItemMaxValue, otherItemMinValue, otherItemUnit, otherItemInputValue,
-                transfusionType, transfusionTypeHisName, conflictItemType, conflictItemName, conflictItemHisName,
-                conflictItemHisDetailName, referenceValue, output, expectedOutput, success, message, inputParams);
-    }
-}

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

@@ -11,9 +11,8 @@ import com.diagbot.dto.KlConceptInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlConceptCommon;
-import com.diagbot.entity.KlDisease;
+import com.diagbot.entity.KlLexicon;
 import com.diagbot.entity.KlLibraryInfo;
-import com.diagbot.entity.KlLis;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -61,6 +60,8 @@ public class KlConceptFacade extends KlConceptServiceImpl {
     KlLisFacade klLisFacade;
     @Autowired
     KlDiseaseFacade klDiseaseFacade;
+    @Autowired
+    KlLexiconFacade klLexiconFacade;
 
     /**
      * @param klConceptInfoVO
@@ -115,7 +116,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 .eq("lib_name", klConceptSaveVO.getLibName())
                 .ne("id", klConceptSaveVO.getConceptId() == null ? -1 : klConceptSaveVO.getConceptId()));
         if (count > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该基础术语名称已存在");
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "医学标准术语名称已存在");
         }
         //校验
         KlConceptSaveSubVO paesubVO = new KlConceptSaveSubVO();
@@ -138,19 +139,24 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                         //保存LibraryInfo
                         res = klLibraryInfoFacade.savekLibraryInfoData(klConceptSaveVO.getConceptId(), subVO);
                     } else {
+                        //校验
+                        klLibraryInfoFacade.checkLibraryInfoData(subVO);
                         UpdateWrapper<KlLibraryInfo> klLibraryInfoQuerySub = new UpdateWrapper<>();
                         klLibraryInfoQuerySub.eq("is_deleted", IsDeleteEnum.N.getKey())
-                                .eq("id", klConceptSaveVO.getLibId())
+                                .eq("id", subVO.getLibId())
                                 .set("gmt_modified", now)
                                 .set("modifier", UserUtils.getCurrentPrincipleID())
-                                .set("name", klConceptSaveVO.getLibName())
-                                .set("spell", klConceptSaveVO.getLibName())
-                                .set("remark", klConceptSaveVO.getLibName());
+                                .set("type_id", subVO.getLibType())
+                                .set("name", subVO.getSynonymName())
+                                .set("spell", subVO.getSpell())
+                                .set("remark",subVO.getRemark());
                         res = klLibraryInfoFacade.update(new KlLibraryInfo(), klLibraryInfoQuerySub);
                     }
                 }
             }
         } else {
+            //校验只能有一条数据
+            checkLibType(klConceptSaveVO);
             //保存新数据
             //1.先保存标准词，生成conceptId
             KlConcept klConceptPare = new KlConcept();
@@ -172,8 +178,9 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 Long conceptId = klConceptPare.getId();
                 KlLibraryInfo klLibraryInfoSub = new KlLibraryInfo();
                 klLibraryInfoSub.setConceptId(conceptId);
-                klLibraryInfoSub.setName(klConceptSaveVO.getSynonymName());
+                klLibraryInfoSub.setName(klConceptSaveVO.getLibName());
                 klLibraryInfoSub.setSpell(klConceptSaveVO.getSpell());
+                klLibraryInfoSub.setTypeId(klConceptSaveVO.getLibType());
                 klLibraryInfoSub.setIsConcept(klConceptSaveVO.getIsConcept());
                 klLibraryInfoSub.setRemark(klConceptSaveVO.getRemark());
                 klLibraryInfoSub.setCreator(UserUtils.getCurrentPrincipleID());
@@ -205,29 +212,12 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             }
             //更新kl_disease
             if (null != klConceptSaveVO.getIcdCode()) {
-                KlDisease kllDiseaseSub = new KlDisease();
-                kllDiseaseSub.setConceptId(klConceptPare.getId());
-                kllDiseaseSub.setGmtModified(now);
-                kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
-                kllDiseaseSub.setCreator(UserUtils.getCurrentPrincipleID());
-                kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
-                kllDiseaseSub.setGmtCreate(now);
-                kllDiseaseSub.setGmtModified(now);
-                res = klDiseaseFacade.save(kllDiseaseSub);
+                res = klDiseaseFacade.saveAll(klConceptPare, klConceptSaveVO);
             }
 
             //更新kl_lis
             if (null != klConceptSaveVO.getScopeType()) {
-                KlLis klLisSub = new KlLis();
-                klLisSub.setConceptId(klConceptPare.getId());
-                klLisSub.setMinValue(klConceptSaveVO.getMinVal());
-                klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
-                klLisSub.setType(klConceptSaveVO.getScopeType());
-                klLisSub.setCreator(UserUtils.getCurrentPrincipleID());
-                klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
-                klLisSub.setGmtCreate(now);
-                klLisSub.setGmtModified(now);
-                res = klLisFacade.save(klLisSub);
+                res = klLisFacade.saveAll(klConceptPare, klConceptSaveVO);
             }
             //增加同义词
             List<KlConceptSaveSubVO> klConceptSub = klConceptSaveVO.getKlConceptSub();
@@ -386,4 +376,19 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         return this.update(klLibraryUpdate);
 
     }
+
+    private void checkLibType(KlConceptSaveVO klConceptSaveVO) {
+        QueryWrapper<KlLexicon> klLexiconQuery = new QueryWrapper<>();
+        klLexiconQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("only_one", 1);
+        List<KlLexicon> klLexiconList = klLexiconFacade.list(klLexiconQuery);
+        List<Integer> libTypeList = klLexiconList.stream().map(KlLexicon::getCode).collect(Collectors.toList());
+        if (libTypeList.contains(klConceptSaveVO.getLibType())) {
+            int count = this.count(new QueryWrapper<KlConcept>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("lib_type", klConceptSaveVO.getLibType()));
+            if (count > 0) {
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该术语类型只能有一个");
+            }
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssCoreClient;
@@ -7,7 +8,10 @@ import com.diagbot.dto.KlConceptStaticDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
+import com.diagbot.entity.User;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.KlConceptStaticServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ChangeStatusVO;
@@ -21,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -33,6 +38,8 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
 
     @Autowired
     private CdssCoreClient cdssCoreClient;
+    @Autowired
+    private UserFacade userFacade;
 
     /**
      * 静态知识检索
@@ -83,6 +90,30 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
         if (RespDTOUtil.respIsOK(respDTO)) {
             page = respDTO.data;
         }
+        List<KlConceptStaticDTO> records = page.getRecords();
+        List<Long> userIds = records.stream().map(KlConceptStaticDTO::getModifier)
+                .distinct()
+                .map(Long::parseLong)
+                .collect(Collectors.toList());
+        List<User> users = userFacade.list(new QueryWrapper<User>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .in("id", userIds, false));
+        if (ListUtil.isNotEmpty(users)) {
+            Map<Long, String> userMap = users.stream().collect(Collectors.toMap(User::getId, User::getLinkman));
+            records.forEach(record -> {
+                if (userMap.containsKey(Long.valueOf(record.getModifier()))) {
+                    record.setModifier(userMap.get(Long.valueOf(record.getModifier())));
+                } else {
+                    record.setModifier("");
+                }
+            });
+
+        } else {
+            records.forEach(record -> {
+                record.setModifier("");
+            });
+        }
+        page.setRecords(records);
         return page;
     }
 

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

@@ -194,5 +194,18 @@ public class KlDiseaseFacade extends KlDiseaseServiceImpl {
         }
         return res;
     }
+
+    public boolean saveAll(KlConcept klConceptPare,KlConceptSaveVO klConceptSaveVO) {
+        Date now = DateUtil.now();
+        KlDisease kllDiseaseSub = new KlDisease();
+        kllDiseaseSub.setConceptId(klConceptPare.getId());
+        kllDiseaseSub.setGmtModified(now);
+        kllDiseaseSub.setIcd10Code(klConceptSaveVO.getIcdCode());
+        kllDiseaseSub.setCreator(UserUtils.getCurrentPrincipleID());
+        kllDiseaseSub.setModifier(UserUtils.getCurrentPrincipleID());
+        kllDiseaseSub.setGmtCreate(now);
+        kllDiseaseSub.setGmtModified(now);
+        return this.save(kllDiseaseSub);
+    }
 }
 

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

@@ -29,9 +29,8 @@ public class KlLibraryInfoFacade extends KlLibraryInfoServiceImpl {
         //校验
         int countLib = this.count(new QueryWrapper<KlLibraryInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("concept_id", subVO.getConceptId())
                 .eq("name", subVO.getSynonymName())
-                .eq("type_id", subVO.getTypeId())
+                .eq("type_id", subVO.getLibType())
                 .ne("id", subVO.getLibId() == null ? -1 : subVO.getLibId()));
         if (countLib > 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该基础术语同义词名称已存在");
@@ -49,6 +48,7 @@ public class KlLibraryInfoFacade extends KlLibraryInfoServiceImpl {
         klLibraryInfoSub.setConceptId(conceptId);
         klLibraryInfoSub.setName(subVO.getSynonymName());
         klLibraryInfoSub.setSpell(subVO.getSpell());
+        klLibraryInfoSub.setTypeId(subVO.getLibType());
         klLibraryInfoSub.setIsConcept(subVO.getIsConcept());
         klLibraryInfoSub.setRemark(subVO.getRemark());
         klLibraryInfoSub.setCreator(UserUtils.getCurrentPrincipleID());

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlDisease;
 import com.diagbot.entity.KlLis;
 import com.diagbot.enums.IsDeleteEnum;
@@ -47,4 +48,18 @@ public class KlLisFacade extends KlLisServiceImpl {
         }
         return res;
     }
+
+    public boolean saveAll(KlConcept klConceptPare,KlConceptSaveVO klConceptSaveVO) {
+        Date now = DateUtil.now();
+        KlLis klLisSub = new KlLis();
+        klLisSub.setConceptId(klConceptPare.getId());
+        klLisSub.setMinValue(klConceptSaveVO.getMinVal());
+        klLisSub.setMaxValue(klConceptSaveVO.getMaxVal());
+        klLisSub.setType(klConceptSaveVO.getScopeType());
+        klLisSub.setCreator(UserUtils.getCurrentPrincipleID());
+        klLisSub.setModifier(UserUtils.getCurrentPrincipleID());
+        klLisSub.setGmtCreate(now);
+        klLisSub.setGmtModified(now);
+       return this.save(klLisSub);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssCoreClient;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.KlRuleByIdParDTO;
 import com.diagbot.dto.KlRuleInfoDTO;
 import com.diagbot.dto.RespDTO;
@@ -10,6 +11,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.KlRuleServiceImpl;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.KlRuleByIdVO;
 import com.diagbot.vo.KlRuleInfoClearVO;
 import com.diagbot.vo.KlRuleInfoSaveVO;
@@ -18,6 +20,10 @@ import com.diagbot.vo.KlRuleSatartOrdisaVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -27,11 +33,21 @@ import org.springframework.stereotype.Component;
 public class KlRuleFacade extends KlRuleServiceImpl {
     @Autowired
     CdssCoreClient cdssCoreClient;
+    @Autowired
+    UserServiceClient userServiceClient;
 
     public Page<KlRuleInfoDTO> getKlRuleInfoPage(KlRuleInfoVO klRuleInfoVO) {
         RespDTO<Page<KlRuleInfoDTO>> klRuleInfoPages = cdssCoreClient.getKlRuleInfoPages(klRuleInfoVO);
         RespDTOUtil.respNGDeal(klRuleInfoPages, "获取分页获取规则维护列表数据失败");
-        return klRuleInfoPages.data;
+        Page<KlRuleInfoDTO> records = klRuleInfoPages.data;
+        List<String> userIds = records.getRecords().stream()
+                .map(i -> i.getModifier()).distinct().collect(Collectors.toList());
+        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(userIds);
+        RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
+        records.getRecords().forEach(i -> {
+            i.setModifierName(respDTO.data.get(i.getModifier()));
+        });
+        return records;
     }
 
     public KlRuleByIdParDTO getByIdRuleInfos(KlRuleByIdVO klRuleByIdVO) {
@@ -41,6 +57,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
     }
 
     public Boolean saveRuleInfos(KlRuleInfoSaveVO klRuleInfoSaveVO) {
+        klRuleInfoSaveVO.setModifier(UserUtils.getCurrentPrincipleID());
         RespDTO<Boolean> booleanRespDTO = cdssCoreClient.saveRuleInfoAll(klRuleInfoSaveVO);
         RespDTOUtil.respNGDeal(booleanRespDTO, "保存规则详情数据失败");
         return booleanRespDTO.data;
@@ -53,12 +70,14 @@ public class KlRuleFacade extends KlRuleServiceImpl {
     }
 
     public Boolean startOrDisableRule(KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        klRuleSatartOrdisaVO.setModifier(UserUtils.getCurrentPrincipleID());
         RespDTO<Boolean> booleanRespDTO = cdssCoreClient.disableRuleInfos(klRuleSatartOrdisaVO);
         RespDTOUtil.respNGDeal(booleanRespDTO, "停用规则失败");
         return booleanRespDTO.data;
     }
 
     public Boolean startRuleInfos(KlRuleSatartOrdisaVO klRuleSatartOrdisaVO) {
+        klRuleSatartOrdisaVO.setModifier(UserUtils.getCurrentPrincipleID());
         RespDTO<Boolean> booleanRespDTO = cdssCoreClient.startRuleInfos(klRuleSatartOrdisaVO);
         RespDTOUtil.respNGDeal(booleanRespDTO, "启用规则失败");
         return booleanRespDTO.data;

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

@@ -157,7 +157,6 @@ public class MedRuleConvertFacade {
         Map<Long, List<RuleDTO>> groupMap = groupList
                 .stream()
                 .collect(Collectors.groupingBy(RuleDTO::getRuleOrderNo));
-        ruleOrderNo = 0L;
         for (Map.Entry<Long, List<RuleDTO>> entry : groupMap.entrySet()) {
             Map<Integer, List<ResultRule>> tempMap = new HashMap<>();
             Integer num = 1;
@@ -165,7 +164,6 @@ public class MedRuleConvertFacade {
                 List<ResultRule> tempList = Lists.newLinkedList();
 
                 ResultRule result = new ResultRule();
-                result.setRuleOrderNo(ruleOrderNo);
                 result.setRuleType(ruleVO.getRuleType());
 
                 result.setRuleId(record.getRuleId());
@@ -372,8 +370,7 @@ public class MedRuleConvertFacade {
                 }
                 tempMap.put(num++, tempList);
             }
-            inputList.addAll(addRuleOrderNo(tempMap, ruleOrderNo));
-            ruleOrderNo = (long) inputList.size();
+            inputList = addRuleOrderNo(tempMap, 1, Lists.newLinkedList(), inputList);
         }
 
         //药品分类扩展
@@ -385,7 +382,6 @@ public class MedRuleConvertFacade {
         Map<Long, List<ResultRule>> medMap = inputList
                 .stream()
                 .collect(Collectors.groupingBy(ResultRule::getRuleOrderNo));
-        ruleOrderNo = 0L;
         for (Map.Entry<Long, List<ResultRule>> entry : medMap.entrySet()) {
             Map<Integer, List<ResultRule>> tempMap = new HashMap<>();
             Integer num = 1;
@@ -419,12 +415,10 @@ public class MedRuleConvertFacade {
                 }
                 tempMap.put(num++, tempList);
             }
-            medicineList.addAll(addRuleOrderNo(tempMap, ruleOrderNo));
-            ruleOrderNo = (long) medicineList.size();
+            medicineList = addRuleOrderNo(tempMap, 1, Lists.newLinkedList(), medicineList);
         }
 
         //禁忌条件“流产”转成包含流产的诊断
-        ruleOrderNo = 0L;
         Map<Long, List<ResultRule>> containsDiseaseMap = medicineList
                 .stream()
                 .collect(Collectors.groupingBy(ResultRule::getRuleOrderNo));
@@ -467,12 +461,10 @@ public class MedRuleConvertFacade {
                 }
                 tempMap.put(num++, tempList);
             }
-            containsDiseaseList.addAll(addRuleOrderNo(tempMap, ruleOrderNo));
-            ruleOrderNo = (long) containsDiseaseList.size();
+            containsDiseaseList = addRuleOrderNo(tempMap, 1, Lists.newLinkedList(), containsDiseaseList);
         }
 
         //正常项目重复开立处理
-        ruleOrderNo = 0L;
         Map<Long, List<ResultRule>> rePacsBillMap = containsDiseaseList
                 .stream()
                 .collect(Collectors.groupingBy(ResultRule::getRuleOrderNo));
@@ -498,15 +490,13 @@ public class MedRuleConvertFacade {
                 }
                 tempMap.put(num++, tempList);
             }
-            rePacsBillList.addAll(addRuleOrderNo(tempMap, ruleOrderNo));
-            ruleOrderNo = (long) rePacsBillList.size();
+            rePacsBillList = addRuleOrderNo(tempMap, 1, Lists.newLinkedList(), rePacsBillList);
         }
 
         if (hospitalId < 0) {
             conflictMappingList = BeanUtil.listCopyTo(rePacsBillList, ResultRule.class);
         } else {
             //术语映射-开单项映射
-            ruleOrderNo = 0L;
             Map<Long, List<ResultRule>> billMappingMap = rePacsBillList
                     .stream()
                     .collect(Collectors.groupingBy(ResultRule::getRuleOrderNo));
@@ -587,12 +577,10 @@ public class MedRuleConvertFacade {
                     }
                     tempMap.put(num++, tempList);
                 }
-                billMappingList.addAll(addRuleOrderNo(tempMap, ruleOrderNo));
-                ruleOrderNo = (long) billMappingList.size();
+                billMappingList = addRuleOrderNo(tempMap, 1, Lists.newLinkedList(), billMappingList);
             }
 
             //术语映射-禁忌项映射
-            ruleOrderNo = 0L;
             Map<Long, List<ResultRule>> conflictMappingMap = billMappingList
                     .stream()
                     .collect(Collectors.groupingBy(ResultRule::getRuleOrderNo));
@@ -633,8 +621,7 @@ public class MedRuleConvertFacade {
                     }
                     tempMap.put(num++, tempList);
                 }
-                conflictMappingList.addAll(addRuleOrderNo(tempMap, ruleOrderNo));
-                ruleOrderNo = (long) conflictMappingList.size();
+                conflictMappingList = addRuleOrderNo(tempMap, 1, Lists.newLinkedList(), conflictMappingList);
             }
         }
 
@@ -684,38 +671,39 @@ public class MedRuleConvertFacade {
         return retList;
     }
 
-    public List<ResultRule> addRuleOrderNo(Map<Integer, List<ResultRule>> map, Long ruleOrderNo) {
-        List<ResultRule> retList = Lists.newLinkedList();
-        ruleOrderNo++;
-        if (map == null || map.size() == 0) {
-            return retList;
-        } else if (map.size() == 1) {
-            List<ResultRule> list1 = map.get(1);
-            for (ResultRule item : list1) {
-                item.setRuleOrderNo(ruleOrderNo++);
-                retList.add(item);
+    public List<ResultRule> addRuleOrderNo(Map<Integer, List<ResultRule>> map, Integer index, List<ResultRule> tempList,  List<ResultRule> retList) {
+        if (index < map.size()) {
+            List<ResultRule> list = map.get(index++);
+            for (ResultRule subResult : list) {
+                ResultRule addResult = new ResultRule();
+                BeanUtil.copyProperties(subResult, addResult);
+                List<ResultRule> groupRuleList = Lists.newLinkedList();
+                if (ListUtil.isNotEmpty(tempList)) {
+                    groupRuleList = BeanUtil.listCopyTo(tempList, ResultRule.class);
+                }
+                groupRuleList.add(addResult);
+                retList = addRuleOrderNo(map, index, groupRuleList, retList);
             }
-        } else if (map.size() == 2) {
-            List<ResultRule> list1 = map.get(1);
-            List<ResultRule> list2 = map.get(2);
-            for (ResultRule item1 : list1) {
-                for (ResultRule item2 : list2) {
-                    ResultRule addItem1 = new ResultRule();
-                    BeanUtil.copyProperties(item1, addItem1);
-                    ResultRule addItem2 = new ResultRule();
-                    BeanUtil.copyProperties(item2, addItem2);
-                    addItem1.setRuleOrderNo(ruleOrderNo);
-                    addItem2.setRuleOrderNo(ruleOrderNo);
-                    retList.add(addItem1);
-                    retList.add(addItem2);
-                    ruleOrderNo++;
+        } else if (index == map.size()) {
+            List<ResultRule> list = map.get(index);
+            for (ResultRule subResult : list) {
+                ResultRule addResult = new ResultRule();
+                BeanUtil.copyProperties(subResult, addResult);
+                Long ruleOrderNo = retList.size() + 1L;
+                List<ResultRule> groupRuleList = Lists.newLinkedList();
+                if (ListUtil.isNotEmpty(tempList)) {
+                    groupRuleList = BeanUtil.listCopyTo(tempList, ResultRule.class);
                 }
+                groupRuleList.add(addResult);
+                for (ResultRule item : groupRuleList) {
+                    item.setRuleOrderNo(ruleOrderNo);
+                }
+                retList.addAll(groupRuleList);
             }
         }
         return retList;
     }
 
-
     /**
      * 高危手术条件去重
      *
@@ -751,6 +739,7 @@ public class MedRuleConvertFacade {
                             .map(i -> i.getGroupType() + "_" + i.getRuleBaseId())
                             .collect(Collectors.joining("|")));
         }
+        //Map<groupType_ruleBaseId,List<ruleId>
         Map<String, List<Long>> reversedMap = new HashMap<>();
         for (Map.Entry<Long, String> entry : conditionMap.entrySet()) {
             List<Long> ruleIds = Lists.newLinkedList();

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

@@ -1,43 +0,0 @@
-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
- * @time: 2021/1/13 17:36
- */
-@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,41 +0,0 @@
-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
- * @time: 2021/1/14 14:58
- */
-@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,31 +0,0 @@
-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
- * @time: 2021/1/15 10:18
- */
-@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,31 +0,0 @@
-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
- * @time: 2021/1/19 13:26
- */
-@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,31 +0,0 @@
-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
- * @time: 2021/1/19 16:46
- */
-@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,31 +0,0 @@
-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
- * @time: 2021/1/20 10:47
- */
-@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,31 +0,0 @@
-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
- * @time: 2021/1/19 20:14
- */
-@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/mapper/ResultBillMapper.java

@@ -1,19 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultBill;
-import com.diagbot.vo.ResultBillPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2021-01-08
- */
-public interface ResultBillMapper extends BaseMapper<ResultBill> {
-    IPage<ResultBill> getPage(@Param("resultBillPageVO") ResultBillPageVO resultBillPageVO);
-}

cdssman-service/src/main/java/com/diagbot/mapper/ResultCriticalMapper.java

@@ -1,19 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultCritical;
-import com.diagbot.vo.ResultCriticalPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author zhaops
- * @since 2021-01-08
- */
-public interface ResultCriticalMapper extends BaseMapper<ResultCritical> {
-    IPage<ResultCritical> getPage(@Param("resultCriticalPageVO") ResultCriticalPageVO resultCriticalPageVO);
-}

cdssman-service/src/main/java/com/diagbot/mapper/ResultHighriskDrugMapper.java

@@ -1,19 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultHighriskDrug;
-import com.diagbot.vo.ResultHighriskDrugPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2021-01-14
- */
-public interface ResultHighriskDrugMapper extends BaseMapper<ResultHighriskDrug> {
-    IPage<ResultHighriskDrug> getPage(@Param("resultHighriskDrugPageVO") ResultHighriskDrugPageVO resultHighriskDrugPageVO);
-}

cdssman-service/src/main/java/com/diagbot/mapper/ResultHighriskOperationMapper.java

@@ -1,20 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultHighriskOperation;
-import com.diagbot.vo.ResultHighriskOperationPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2021-01-15
- */
-public interface ResultHighriskOperationMapper extends BaseMapper<ResultHighriskOperation> {
-
-    IPage<ResultHighriskOperation> getPage(@Param("resultHighriskOperationPageVO") ResultHighriskOperationPageVO resultHighriskOperationPageVO);
-}

cdssman-service/src/main/java/com/diagbot/mapper/ResultOtherLisMapper.java

@@ -1,20 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultOtherLis;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-public interface ResultOtherLisMapper extends BaseMapper<ResultOtherLis> {
-
-    IPage<ResultOtherLis> getPage(@Param("resultPageVO") ResultPageVO resultPageVO);
-}

cdssman-service/src/main/java/com/diagbot/mapper/ResultOtherPacsMapper.java

@@ -1,19 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultOtherPacs;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-public interface ResultOtherPacsMapper extends BaseMapper<ResultOtherPacs> {
-    IPage<ResultOtherPacs> getPage(@Param("resultPageVO") ResultPageVO resultPageVO);
-}

cdssman-service/src/main/java/com/diagbot/mapper/ResultOtherTransfusionMapper.java

@@ -1,20 +0,0 @@
-package com.diagbot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultOtherTransfusion;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-public interface ResultOtherTransfusionMapper extends BaseMapper<ResultOtherTransfusion> {
-
-    IPage<ResultOtherTransfusion> getPage(@Param("resultPageVO")ResultPageVO resultPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/ResultBillService.java

@@ -1,20 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ResultBill;
-import com.diagbot.vo.ResultBillPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zhaops
- * @since 2021-01-08
- */
-public interface ResultBillService extends IService<ResultBill> {
-
-    IPage<ResultBill> getPage(@Param("resultBillPageVO") ResultBillPageVO resultBillPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/ResultCriticalService.java

@@ -1,19 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ResultCritical;
-import com.diagbot.vo.ResultCriticalPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zhaops
- * @since 2021-01-08
- */
-public interface ResultCriticalService extends IService<ResultCritical> {
-    IPage<ResultCritical> getPage(@Param("resultCriticalPageVO") ResultCriticalPageVO resultCriticalPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/ResultHighriskDrugService.java

@@ -1,19 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultHighriskDrug;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.vo.ResultHighriskDrugPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-14
- */
-public interface ResultHighriskDrugService extends IService<ResultHighriskDrug> {
-    IPage<ResultHighriskDrug> getPage(@Param("resultHighriskDrugPageVO") ResultHighriskDrugPageVO resultHighriskDrugPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/ResultHighriskOperationService.java

@@ -1,19 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ResultHighriskOperation;
-import com.diagbot.vo.ResultHighriskOperationPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-15
- */
-public interface ResultHighriskOperationService extends IService<ResultHighriskOperation> {
-    IPage<ResultHighriskOperation> getPage(@Param("resultHighriskOperationPageVO") ResultHighriskOperationPageVO resultHighriskOperationPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/ResultOtherLisService.java

@@ -1,19 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ResultOtherLis;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-public interface ResultOtherLisService extends IService<ResultOtherLis> {
-    IPage<ResultOtherLis> getPage(@Param("resultPageVO") ResultPageVO resultPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/ResultOtherPacsService.java

@@ -1,19 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultOtherPacs;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-public interface ResultOtherPacsService extends IService<ResultOtherPacs> {
-    IPage<ResultOtherPacs> getPage(@Param("resultPageVO") ResultPageVO resultPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/ResultOtherTransfusionService.java

@@ -1,19 +0,0 @@
-package com.diagbot.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.entity.ResultOtherTransfusion;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-public interface ResultOtherTransfusionService extends IService<ResultOtherTransfusion> {
-    IPage<ResultOtherTransfusion> getPage(@Param("resultPageVO") ResultPageVO resultPageVO);
-}

cdssman-service/src/main/java/com/diagbot/service/UserService.java

@@ -1,5 +1,6 @@
 package com.diagbot.service;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.diagbot.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,6 +14,8 @@ import java.util.List;
  * @author wangfeng
  * @since 2020-08-11
  */
+
+@DS("master")
 public interface UserService extends IService<User> {
     public List<User> getByIds(List<Long> ids);
 }

cdssman-service/src/main/java/com/diagbot/service/impl/ResultBillServiceImpl.java

@@ -1,27 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultBill;
-import com.diagbot.mapper.ResultBillMapper;
-import com.diagbot.service.ResultBillService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.ResultBillPageVO;
-
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2021-01-08
- */
-@Service
-public class ResultBillServiceImpl extends ServiceImpl<ResultBillMapper, ResultBill> implements ResultBillService {
-
-    public IPage<ResultBill> getPage(@Param("resultBillPageVO") ResultBillPageVO resultBillPageVO) {
-        return baseMapper.getPage(resultBillPageVO);
-    }
-}

cdssman-service/src/main/java/com/diagbot/service/impl/ResultCriticalServiceImpl.java

@@ -1,25 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultCritical;
-import com.diagbot.mapper.ResultCriticalMapper;
-import com.diagbot.service.ResultCriticalService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.ResultCriticalPageVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author zhaops
- * @since 2021-01-08
- */
-@Service
-public class ResultCriticalServiceImpl extends ServiceImpl<ResultCriticalMapper, ResultCritical> implements ResultCriticalService {
-    public IPage<ResultCritical> getPage(@Param("resultCriticalPageVO") ResultCriticalPageVO resultCriticalPageVO) {
-        return baseMapper.getPage(resultCriticalPageVO);
-    }
-}

cdssman-service/src/main/java/com/diagbot/service/impl/ResultHighriskDrugServiceImpl.java

@@ -1,25 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.ResultHighriskDrug;
-import com.diagbot.mapper.ResultHighriskDrugMapper;
-import com.diagbot.service.ResultHighriskDrugService;
-import com.diagbot.vo.ResultHighriskDrugPageVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-14
- */
-@Service
-public class ResultHighriskDrugServiceImpl extends ServiceImpl<ResultHighriskDrugMapper, ResultHighriskDrug> implements ResultHighriskDrugService {
-    public IPage<ResultHighriskDrug> getPage(@Param("resultHighriskDrugPageVO") ResultHighriskDrugPageVO resultHighriskDrugPageVO) {
-        return baseMapper.getPage(resultHighriskDrugPageVO);
-    }
-}

cdssman-service/src/main/java/com/diagbot/service/impl/ResultHighriskOperationServiceImpl.java

@@ -1,25 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.ResultHighriskOperation;
-import com.diagbot.mapper.ResultHighriskOperationMapper;
-import com.diagbot.service.ResultHighriskOperationService;
-import com.diagbot.vo.ResultHighriskOperationPageVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-15
- */
-@Service
-public class ResultHighriskOperationServiceImpl extends ServiceImpl<ResultHighriskOperationMapper, ResultHighriskOperation> implements ResultHighriskOperationService {
-    public IPage<ResultHighriskOperation> getPage(@Param("resultHighriskOperationPageVO") ResultHighriskOperationPageVO resultHighriskOperationPageVO) {
-        return baseMapper.getPage(resultHighriskOperationPageVO);
-    }
-}

cdssman-service/src/main/java/com/diagbot/service/impl/ResultOtherLisServiceImpl.java

@@ -1,26 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.entity.ResultOtherLis;
-import com.diagbot.mapper.ResultOtherLisMapper;
-import com.diagbot.service.ResultOtherLisService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-@Service
-public class ResultOtherLisServiceImpl extends ServiceImpl<ResultOtherLisMapper, ResultOtherLis> implements ResultOtherLisService {
-
-    public IPage<ResultOtherLis> getPage(@Param("resultPageVO") ResultPageVO resultPageVO) {
-        return baseMapper.getPage(resultPageVO);
-    }
-}

cdssman-service/src/main/java/com/diagbot/service/impl/ResultOtherPacsServiceImpl.java

@@ -1,26 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.ResultOtherPacs;
-import com.diagbot.mapper.ResultOtherPacsMapper;
-import com.diagbot.service.ResultOtherPacsService;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-@Service
-public class ResultOtherPacsServiceImpl extends ServiceImpl<ResultOtherPacsMapper, ResultOtherPacs> implements ResultOtherPacsService {
-
-    public IPage<ResultOtherPacs> getPage(@Param("resultPageVO") ResultPageVO resultPageVO) {
-        return baseMapper.getPage(resultPageVO);
-    }
-}

cdssman-service/src/main/java/com/diagbot/service/impl/ResultOtherTransfusionServiceImpl.java

@@ -1,26 +0,0 @@
-package com.diagbot.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.entity.ResultOtherTransfusion;
-import com.diagbot.mapper.ResultOtherTransfusionMapper;
-import com.diagbot.service.ResultOtherTransfusionService;
-import com.diagbot.vo.ResultPageVO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author gaodm
- * @since 2021-01-19
- */
-@Service
-public class ResultOtherTransfusionServiceImpl extends ServiceImpl<ResultOtherTransfusionMapper, ResultOtherTransfusion> implements ResultOtherTransfusionService {
-
-    public IPage<ResultOtherTransfusion> getPage(@Param("resultPageVO") ResultPageVO resultPageVO) {
-        return baseMapper.getPage(resultPageVO);
-    }
-}

cdssman-service/src/main/java/com/diagbot/vo/KlConceptSaveSubVO.java

@@ -16,7 +16,7 @@ public class KlConceptSaveSubVO {
     private String synonymName;
     private String spell;
     //词性id
-    private String TypeId;
+    private Integer libType;
     //是否标准词,1:是,0:否
     private Integer isConcept = 0;
     private String remark;

cdssman-service/src/main/java/com/diagbot/vo/KlConceptSaveVO.java

@@ -17,10 +17,10 @@ import java.util.List;
 public class KlConceptSaveVO {
     private Long conceptId;
     private Long libId;
-    @NotBlank(message = "请输入术语名称")
+    @NotBlank(message = "请输入医学标准术语名称")
     private String libName;
     private String spell;
-    @NotNull(message = "请输入术语词性type")
+    @NotNull(message = "请输入医学标准术语词性type")
     private Integer libType;
     private String synonymName;
     @NotNull(message = "请输入状态")

cdssman-service/src/main/java/com/diagbot/vo/KlRuleInfoSaveVO.java

@@ -31,5 +31,6 @@ public class KlRuleInfoSaveVO {
     /*    private String parlibName;
         private String parLenName;
         private String parLenCode;*/
+    private String modifier;
     private List<KlRuleInfoSaveSubVO> klRuleInfoSaveSub;
 }

cdssman-service/src/main/java/com/diagbot/vo/KlRuleSatartOrdisaVO.java

@@ -15,4 +15,5 @@ import javax.validation.constraints.NotNull;
 public class KlRuleSatartOrdisaVO {
     @NotNull(message = "请输id")
     private Long id;
+    private String modifier;
 }

cdssman-service/src/main/java/com/diagbot/vo/ResultBillPageVO.java

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2021/1/13 17:25
- */
-@Getter
-@Setter
-public class ResultBillPageVO extends Page {
-    private Integer success;
-    private Long resultId;
-    private Integer billType;
-}

cdssman-service/src/main/java/com/diagbot/vo/ResultCriticalPageVO.java

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2021/1/14 14:54
- */
-@Getter
-@Setter
-public class ResultCriticalPageVO extends Page {
-    private Integer success;
-    private Long resultId;
-    private Integer criticalType;
-}

cdssman-service/src/main/java/com/diagbot/vo/ResultHighriskDrugPageVO.java

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2021/1/15 10:14
- */
-@Getter
-@Setter
-public class ResultHighriskDrugPageVO extends Page {
-    private Integer success;
-    private Long resultId;
-}

cdssman-service/src/main/java/com/diagbot/vo/ResultHighriskOperationPageVO.java

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2021/1/19 13:22
- */
-@Getter
-@Setter
-public class ResultHighriskOperationPageVO  extends Page {
-    private Integer success;
-    private Long resultId;
-}

cdssman-service/src/main/java/com/diagbot/vo/ResultPageVO.java

@@ -1,17 +0,0 @@
-package com.diagbot.vo;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2021/1/19 15:50
- */
-@Getter
-@Setter
-public class ResultPageVO extends Page {
-    private Integer success;
-    private Long resultId;
-}

cdssman-service/src/main/resources/mapper/KlConceptMapper.xml

@@ -43,7 +43,7 @@
         <if test="libType!=null and libType!=''">
             AND UPPER(b.lib_type) LIKE CONCAT('%', UPPER(trim(#{libType})), '%')
         </if>
-        <if test="libType!=null and libType!=''">
+        <if test="libName!=null and libName!=''">
             AND UPPER(b.lib_name) LIKE CONCAT('%', UPPER(trim(#{libName})), '%')
         </if>
         <if test="status != null">
@@ -53,7 +53,7 @@
             AND UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{synonymName})), '%')
         </if>
         GROUP BY a.concept_id
-        ORDER BY b.gmt_modified DESC
+        ORDER BY b.status DESC ,b.gmt_modified DESC
     </select>
     <select id="getConceptAll" resultType="com.diagbot.dto.KlConceptAllDTO">
         SELECT

cdssman-service/src/main/resources/mapper/KlLexiconMapper.xml

@@ -34,8 +34,6 @@
         <if test="code!=null">
             AND UPPER(code) LIKE CONCAT('%', UPPER(trim(#{code})), '%')
         </if>
-        ORDER BY
-            gmt_modified DESC
     </select>
 
 </mapper>

cdssman-service/src/main/resources/mapper/KlLexiconRelationshipMapper.xml

@@ -30,7 +30,5 @@
         <if test="code!=null">
             AND UPPER(code) LIKE CONCAT('%', UPPER(trim(#{code})), '%')
         </if>
-        ORDER BY
-        gmt_modified DESC
     </select>
 </mapper>

cdssman-service/src/main/resources/mapper/KlRelationMapper.xml

@@ -76,7 +76,6 @@
         AND b.id = d.t_relation_id
         AND d.is_deleted = 'N'
         ORDER BY
-            a.id,
             d.order_no
     </select>
 

cdssman-service/src/main/resources/mapper/ResultBillMapper.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ResultBillMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ResultBill">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="result_id" property="resultId" />
-        <result column="bill_type" property="billType" />
-        <result column="bill_item_type_code" property="billItemTypeCode" />
-        <result column="bill_item_type" property="billItemType" />
-        <result column="bill_item_name" property="billItemName" />
-        <result column="bill_item_his_name" property="billItemHisName" />
-        <result column="bill_item_his_detail_name" property="billItemHisDetailName" />
-        <result column="conflict_type" property="conflictType" />
-        <result column="conflict_item_type_code" property="conflictItemTypeCode" />
-        <result column="conflict_item_type" property="conflictItemType" />
-        <result column="conflict_item_name" property="conflictItemName" />
-        <result column="conflict_item_his_name" property="conflictItemHisName" />
-        <result column="conflict_item_his_detail_name" property="conflictItemHisDetailName" />
-        <result column="input_value" property="inputValue" />
-        <result column="reference_value" property="referenceValue" />
-        <result column="max_value" property="maxValue" />
-        <result column="min_value" property="minValue" />
-        <result column="unit" property="unit" />
-        <result column="conflict_item_range" property="conflictItemRange" />
-        <result column="output" property="output" />
-        <result column="expected_output" property="expectedOutput" />
-        <result column="success" property="success" />
-        <result column="message" property="message" />
-        <result column="input_params" property="inputParams" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.ResultBill">
-        select a.*
-        from test_result_bill a
-        where a.is_deleted='N'
-        <if test="resultBillPageVO.success != null">
-            and a.success = #{resultBillPageVO.success}
-        </if>
-        <if test="resultBillPageVO.resultId != null">
-            and a.result_id = #{resultBillPageVO.resultId}
-        </if>
-        <if test="resultBillPageVO.billType != null">
-            and a.bill_type = #{resultBillPageVO.billType}
-        </if>
-    </select>
-</mapper>

cdssman-service/src/main/resources/mapper/ResultCriticalMapper.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ResultCriticalMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ResultCritical">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="result_id" property="resultId" />
-        <result column="critical_type" property="criticalType" />
-        <result column="critical_item_type" property="criticalItemType" />
-        <result column="critical_item_name" property="criticalItemName" />
-        <result column="critical_item_his_name" property="criticalItemHisName" />
-        <result column="critical_item_his_detail_name" property="criticalItemHisDetailName" />
-        <result column="input_value" property="inputValue" />
-        <result column="reference_value" property="referenceValue" />
-        <result column="critical_item_range" property="criticalItemRange" />
-        <result column="min_value" property="minValue" />
-        <result column="max_value" property="maxValue" />
-        <result column="unit" property="unit" />
-        <result column="min_age" property="minAge" />
-        <result column="max_age" property="maxAge" />
-        <result column="output" property="output" />
-        <result column="expected_output" property="expectedOutput" />
-        <result column="success" property="success" />
-        <result column="message" property="message" />
-        <result column="input_params" property="inputParams" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.ResultCritical">
-        select a.*
-        from test_result_critical a
-        where a.is_deleted='N'
-        <if test="resultCriticalPageVO.success != null">
-            and a.success = #{resultCriticalPageVO.success}
-        </if>
-        <if test="resultCriticalPageVO.resultId != null">
-            and a.result_id = #{resultCriticalPageVO.resultId}
-        </if>
-        <if test="resultCriticalPageVO.criticalType != null">
-            and a.critical_type = #{resultCriticalPageVO.criticalType}
-        </if>
-    </select>
-</mapper>

cdssman-service/src/main/resources/mapper/ResultHighriskDrugMapper.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ResultHighriskDrugMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ResultHighriskDrug">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="result_id" property="resultId" />
-        <result column="highrisk_item_name" property="highriskItemName" />
-        <result column="highrisk_item_reg_name" property="highriskItemRegName" />
-        <result column="highrisk_item_his_name" property="highriskItemHisName" />
-        <result column="highrisk_item_form" property="highriskItemForm" />
-        <result column="highrisk_level" property="highriskLevel" />
-        <result column="output" property="output" />
-        <result column="expected_output" property="expectedOutput" />
-        <result column="success" property="success" />
-        <result column="message" property="message" />
-        <result column="input_params" property="inputParams" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.ResultHighriskDrug">
-        select a.*
-        from test_result_highrisk_drug a
-        where a.is_deleted='N'
-        <if test="resultHighriskDrugPageVO.success != null">
-            and a.success = #{resultHighriskDrugPageVO.success}
-        </if>
-        <if test="resultHighriskDrugPageVO.resultId != null">
-            and a.result_id = #{resultHighriskDrugPageVO.resultId}
-        </if>
-    </select>
-</mapper>

cdssman-service/src/main/resources/mapper/ResultHighriskOperationMapper.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ResultHighriskOperationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ResultHighriskOperation">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="result_id" property="resultId" />
-        <result column="highrisk_item_name" property="highriskItemName" />
-        <result column="highrisk_item_his_name" property="highriskItemHisName" />
-        <result column="level" property="level" />
-        <result column="factor_item_name" property="factorItemName" />
-        <result column="factor_item_his_name" property="factorItemHisName" />
-        <result column="factor_item_his_detail_name" property="factorItemHisDetailName" />
-        <result column="factor_item_type" property="factorItemType" />
-        <result column="factor_item_range" property="factorItemRange" />
-        <result column="factor_item_min_value" property="factorItemMinValue" />
-        <result column="factor_item_max_value" property="factorItemMaxValue" />
-        <result column="input_value" property="inputValue" />
-        <result column="factor_item_unit" property="factorItemUnit" />
-        <result column="factor_item_exact_match" property="factorItemExactMatch" />
-        <result column="factor_item_cond" property="factorItemCond" />
-        <result column="output" property="output" />
-        <result column="expected_output" property="expectedOutput" />
-        <result column="success" property="success" />
-        <result column="message" property="message" />
-        <result column="input_params" property="inputParams" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.ResultHighriskOperation">
-        select a.*
-        from test_result_highrisk_operation a
-        where a.is_deleted='N'
-        <if test="resultHighriskOperationPageVO.success != null">
-            and a.success = #{resultHighriskOperationPageVO.success}
-        </if>
-        <if test="resultHighriskOperationPageVO.resultId != null">
-            and a.result_id = #{resultHighriskOperationPageVO.resultId}
-        </if>
-    </select>
-
-</mapper>

cdssman-service/src/main/resources/mapper/ResultOtherLisMapper.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ResultOtherLisMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ResultOtherLis">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="result_id" property="resultId" />
-        <result column="other_item_type" property="otherItemType" />
-        <result column="other_item_name" property="otherItemName" />
-        <result column="other_item_his_name" property="otherItemHisName" />
-        <result column="other_item_his_detail_name" property="otherItemHisDetailName" />
-        <result column="other_item_range" property="otherItemRange" />
-        <result column="remind_item_type" property="remindItemType" />
-        <result column="remind_item_name" property="remindItemName" />
-        <result column="remind_item_his_name" property="remindItemHisName" />
-        <result column="remind_item_his_detail_name" property="remindItemHisDetailName" />
-        <result column="input_value" property="inputValue" />
-        <result column="reference_value" property="referenceValue" />
-        <result column="max_value" property="maxValue" />
-        <result column="min_value" property="minValue" />
-        <result column="unit" property="unit" />
-        <result column="output" property="output" />
-        <result column="expected_output" property="expectedOutput" />
-        <result column="success" property="success" />
-        <result column="message" property="message" />
-        <result column="input_params" property="inputParams" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.ResultOtherLis">
-        select a.*
-        from test_result_other_lis a
-        where a.is_deleted='N'
-        <if test="resultPageVO.success != null">
-            and a.success = #{resultPageVO.success}
-        </if>
-        <if test="resultPageVO.resultId != null">
-            and a.result_id = #{resultPageVO.resultId}
-        </if>
-    </select>
-
-</mapper>

cdssman-service/src/main/resources/mapper/ResultOtherPacsMapper.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ResultOtherPacsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ResultOtherPacs">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="result_id" property="resultId" />
-        <result column="pacs_describe" property="pacsDescribe" />
-        <result column="pacs_result" property="pacsResult" />
-        <result column="remind_item_type" property="remindItemType" />
-        <result column="remind_item_name" property="remindItemName" />
-        <result column="remind_item_his_name" property="remindItemHisName" />
-        <result column="remind_item_his_detail_name" property="remindItemHisDetailName" />
-        <result column="reference_value" property="referenceValue" />
-        <result column="max_age" property="maxAge" />
-        <result column="min_age" property="minAge" />
-        <result column="age_range" property="ageRange" />
-        <result column="input_age" property="inputAge" />
-        <result column="gender" property="gender" />
-        <result column="postoken" property="postoken" />
-        <result column="negtoken" property="negtoken" />
-        <result column="output" property="output" />
-        <result column="expected_output" property="expectedOutput" />
-        <result column="success" property="success" />
-        <result column="message" property="message" />
-        <result column="input_params" property="inputParams" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.ResultOtherPacs">
-        select a.*
-        from test_result_other_pacs a
-        where a.is_deleted='N'
-        <if test="resultPageVO.success != null">
-            and a.success = #{resultPageVO.success}
-        </if>
-        <if test="resultPageVO.resultId != null">
-            and a.result_id = #{resultPageVO.resultId}
-        </if>
-    </select>
-
-</mapper>

cdssman-service/src/main/resources/mapper/ResultOtherTransfusionMapper.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.diagbot.mapper.ResultOtherTransfusionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.diagbot.entity.ResultOtherTransfusion">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="result_id" property="resultId" />
-        <result column="other_item_name" property="otherItemName" />
-        <result column="other_item_his_name" property="otherItemHisName" />
-        <result column="other_item_his_detail_name" property="otherItemHisDetailName" />
-        <result column="other_item_range" property="otherItemRange" />
-        <result column="other_item_max_value" property="otherItemMaxValue" />
-        <result column="other_item_min_value" property="otherItemMinValue" />
-        <result column="other_item_unit" property="otherItemUnit" />
-        <result column="other_item_input_value" property="otherItemInputValue" />
-        <result column="transfusion_type" property="transfusionType" />
-        <result column="transfusion_type_his_name" property="transfusionTypeHisName" />
-        <result column="conflict_item_type" property="conflictItemType" />
-        <result column="conflict_item_name" property="conflictItemName" />
-        <result column="conflict_item_his_name" property="conflictItemHisName" />
-        <result column="conflict_item_his_detail_name" property="conflictItemHisDetailName" />
-        <result column="reference_value" property="referenceValue" />
-        <result column="output" property="output" />
-        <result column="expected_output" property="expectedOutput" />
-        <result column="success" property="success" />
-        <result column="message" property="message" />
-        <result column="input_params" property="inputParams" />
-    </resultMap>
-
-    <!-- 分页查询 -->
-    <select id="getPage" resultType="com.diagbot.entity.ResultOtherTransfusion">
-        select a.*
-        from test_result_other_transfusion a
-        where a.is_deleted='N'
-        <if test="resultPageVO.success != null">
-            and a.success = #{resultPageVO.success}
-        </if>
-        <if test="resultPageVO.resultId != null">
-            and a.result_id = #{resultPageVO.resultId}
-        </if>
-    </select>
-
-</mapper>