自动化测试

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

@@ -0,0 +1,34 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Objects;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/17 13:19
+ */
+@Getter
+@Setter
+public class LexiconDTO {
+    private Integer libType;
+    private String libTypeName;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        LexiconDTO lexiconDTO = (LexiconDTO) o;
+        return Objects.equals(libType, lexiconDTO.libType)
+                && Objects.equals(libTypeName, lexiconDTO.libTypeName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(libType, libTypeName);
+    }
+}

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

@@ -2,6 +2,7 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.LexiconDTO;
 import com.diagbot.dto.ResultRulePageDTO;
 import com.diagbot.entity.ResultRule;
 import com.diagbot.service.impl.ResultRuleServiceImpl;
@@ -13,6 +14,8 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -70,6 +73,7 @@ public class ResultRuleFacade extends ResultRuleServiceImpl {
         IPage<ResultRulePageDTO> page = super.getPage(resultRulePageVO);
         List<ResultRulePageDTO> records = page.getRecords();
         List<ResultRule> baseRules = this.list(new QueryWrapper<ResultRule>()
+                .eq("result_id", resultRulePageVO.getResultId())
                 .eq("success", resultRulePageVO.getSuccess()));
 
         Map<Long, ResultRule> baseRuleMap = baseRules.stream().collect(Collectors.toMap(ResultRule::getId, v -> v));
@@ -87,4 +91,41 @@ public class ResultRuleFacade extends ResultRuleServiceImpl {
         String fileName = "规则测试结果导出.xls";
         ExcelUtils.exportExcelUser(records, null, "sheet1", ResultRulePageDTO.class, fileName, response);
     }
+
+    /**
+     * 动态获取下拉菜单选项
+     *
+     * @param resultRulePageVO
+     * @return
+     */
+    public Map<String, List<LexiconDTO>> getDroplistData(ResultRulePageVO resultRulePageVO) {
+        Map<String, List<LexiconDTO>> map = new HashMap<>();
+        List<ResultRule> list = this.list(new QueryWrapper<ResultRule>()
+                .eq("result_id", resultRulePageVO.getResultId())
+                .eq("success", resultRulePageVO.getSuccess()));
+
+        List<LexiconDTO> libTypeList = list.stream().map(item -> {
+            LexiconDTO lexiconDTO = new LexiconDTO();
+            lexiconDTO.setLibType(item.getRuleLibType());
+            lexiconDTO.setLibTypeName(item.getRuleLibTypeName());
+            return lexiconDTO;
+        }).distinct()
+                .sorted(Comparator.comparing(LexiconDTO::getLibType))
+                .collect(Collectors.toList());
+
+        List<LexiconDTO> baseLibTypeList = list.stream()
+                .filter(i -> i.getRuleBaseLibType() != null)
+                .map(item -> {
+                    LexiconDTO lexiconDTO = new LexiconDTO();
+                    lexiconDTO.setLibType(item.getRuleBaseLibType());
+                    lexiconDTO.setLibTypeName(item.getRuleBaseLibTypeName());
+                    return lexiconDTO;
+                }).distinct()
+                .sorted(Comparator.comparing(LexiconDTO::getLibType))
+                .collect(Collectors.toList());
+
+        map.put("ruleLibType", libTypeList);
+        map.put("ruleBaseLibType", baseLibTypeList);
+        return map;
+    }
 }

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

@@ -127,104 +127,106 @@ public class RuleTestFacade {
     /**
      * 开单合理性测试
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      */
-    public Boolean billRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.billRuleTest(billRuleVO);
+    public Boolean billRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.billRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 开单合理性测试-输血
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      */
-    public Boolean billTransfusionRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.billTransfusionRuleTest(billRuleVO);
+    public Boolean billTransfusionRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.billTransfusionRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 危急值规则测试-检验
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      */
-    public Boolean criticalLisRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.criticalLisRuleTest(billRuleVO);
+    public Boolean criticalLisRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.criticalLisRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 危急值规则测试-检查
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      */
-    public Boolean criticalPacsRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.criticalPacsRuleTest(billRuleVO);
+    public Boolean criticalPacsRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.criticalPacsRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 高危药品测试
      *
+     * @param ruleTestVO
      * @return
      */
-    public Boolean highriskDrugRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.highriskDrugRuleTest(billRuleVO);
+    public Boolean highriskDrugRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.highriskDrugRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 高危手术测试
      *
+     * @param ruleTestVO
      * @return
      */
-    public Boolean highriskOperationRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.highriskOperationRuleTest(billRuleVO);
+    public Boolean highriskOperationRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.highriskOperationRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 其他值提醒-化验
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      * @return
      */
-    public Boolean otherLisRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.otherLisRuleTest(billRuleVO);
+    public Boolean otherLisRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.otherLisRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 其他值提醒-辅检
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      * @return
      */
-    public Boolean otherPacsRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.otherPacsRuleTest(billRuleVO);
+    public Boolean otherPacsRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.otherPacsRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 其他值提醒-输血
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      * @return
      */
-    public Boolean otherTransfusionRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.otherTransfusionRuleTest(billRuleVO);
+    public Boolean otherTransfusionRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.otherTransfusionRuleTest(ruleTestVO);
         return true;
     }
 
     /**
      * 正常项重复开单
      *
-     * @param billRuleVO
+     * @param ruleTestVO
      * @return
      */
-    public Boolean reBillRuleTest(RuleTestVO billRuleVO) {
-        ruleTestAggregate.reBillRuleTest(billRuleVO);
+    public Boolean reBillRuleTest(RuleTestVO ruleTestVO) {
+        ruleTestAggregate.reBillRuleTest(ruleTestVO);
         return true;
     }
 

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.CaseResultDTO;
+import com.diagbot.dto.LexiconDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.ResultRulePageDTO;
 import com.diagbot.facade.ResultInfoFacade;
@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -89,6 +91,16 @@ public class RuleTestController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "动态加载下拉菜单选项[zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>" )
+    @PostMapping("/getDroplistData")
+    @SysLogger("getDroplistData")
+    public RespDTO<Map<String,List<LexiconDTO>>> getDroplistData(@Valid @RequestBody ResultRulePageVO resultRulePageVO) {
+        Map<String, List<LexiconDTO>> data = resultRuleFacade.getDroplistData(resultRulePageVO);
+        return RespDTO.onSuc(data);
+    }
+
     //endregion --------------------------分页查询------------------------------
 
     //region --------------------------导出------------------------------