医学规则测试

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

@@ -0,0 +1,13 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.ResultHighriskDrugServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/1/15 10:18
+ */
+@Component
+public class ResultHighriskDrugFacade extends ResultHighriskDrugServiceImpl {
+}

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

@@ -604,7 +604,17 @@ public class RuleConvertFacade {
                 retMappingList.add(result);
             }
         }
-        return retMappingList;
+
+        for (ResultHighriskDrug result : retMappingList) {
+            if (result.getSuccess() != null && result.getSuccess().equals(0)) {
+                retList.add(result);
+                continue;
+            }
+            BillMsg billMsg = MsgUtil.getCommonHighRiskMsg(result.getHighriskItemHisName(), result.getHighriskLevel(), TypeEnum.drug.getName());
+            result.setExpectedOutput(billMsg.getMsg());
+            retList.add(result);
+        }
+        return retList;
     }
 
     public MappingShortEntity setMappingShortEntity(String name, String hisName, String hisDetailName) {

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

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
-import com.diagbot.entity.ResultHighriskDrug;
 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>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-01-14
  */
 public interface ResultHighriskDrugMapper extends BaseMapper<ResultHighriskDrug> {
-
+    IPage<ResultHighriskDrug> getPage(@Param("resultHighriskDrugPageVO") ResultHighriskDrugPageVO resultHighriskDrugPageVO);
 }

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

@@ -1,7 +1,10 @@
 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>
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @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/impl/ResultHighriskDrugServiceImpl.java

@@ -1,9 +1,12 @@
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.ResultHighriskDrugPageVO;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +19,7 @@ import org.springframework.stereotype.Service;
  */
 @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/vo/ResultHighriskDrugPageVO.java

@@ -0,0 +1,17 @@
+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/web/RuleTestController.java

@@ -6,8 +6,10 @@ import com.diagbot.dto.CaseResultDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ResultBill;
 import com.diagbot.entity.ResultCritical;
+import com.diagbot.entity.ResultHighriskDrug;
 import com.diagbot.facade.ResultBillFacade;
 import com.diagbot.facade.ResultCriticalFacade;
+import com.diagbot.facade.ResultHighriskDrugFacade;
 import com.diagbot.facade.ResultInfoFacade;
 import com.diagbot.facade.RuleTestFacade;
 import com.diagbot.vo.BillRuleVO;
@@ -16,6 +18,7 @@ import com.diagbot.vo.HighriskRuleVO;
 import com.diagbot.vo.HospitalIdVO;
 import com.diagbot.vo.ResultBillPageVO;
 import com.diagbot.vo.ResultCriticalPageVO;
+import com.diagbot.vo.ResultHighriskDrugPageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +48,8 @@ public class RuleTestController {
     private ResultBillFacade resultBillFacade;
     @Autowired
     private ResultCriticalFacade resultCriticalFacade;
+    @Autowired
+    private ResultHighriskDrugFacade resultHighriskDrugFacade;
 
     /**
      * 数据导出
@@ -133,6 +138,16 @@ public class RuleTestController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "高危药品测试列表[zhaops]",
+            notes = "success： 成功标志（0：失败，1：成功） <br>" +
+                    "resultId： 结果id <br>")
+    @PostMapping("/getResultHighriskDrugPage")
+    @SysLogger("getResultHighriskDrugPage")
+    public RespDTO<IPage<ResultHighriskDrug>> getResultHighriskDrugPage(@Valid @RequestBody ResultHighriskDrugPageVO resultHighriskDrugPageVO) {
+        IPage<ResultHighriskDrug> data = resultHighriskDrugFacade.getPage(resultHighriskDrugPageVO);
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "高危药品、手术规则测试[zhaops]",
             notes = "hospitalId： 医院Id <br>" +
                     "caseId： 测试用例id<br>" +

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

@@ -43,7 +43,7 @@
             and a.result_id = #{resultCriticalPageVO.resultId}
         </if>
         <if test="resultCriticalPageVO.criticalType != null">
-            and a.criticalType = #{resultCriticalPageVO.criticalType}
+            and a.critical_type = #{resultCriticalPageVO.criticalType}
         </if>
     </select>
 </mapper>

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

@@ -23,4 +23,16 @@
         <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>

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

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