医学规则测试

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

@@ -75,13 +75,13 @@ public class ExportCriticalLisDTO {
     /**
      * 开单项名称（医院端）
      */
-    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "3")
+    @Excel(name = "实验室检查套餐名（医院术语）", width = 40, orderNum = "3")
     private String criticalItemHisName;
 
     /**
      * 开单项名称-细项（医院端）
      */
-    @Excel(name = "实验室检查名称-细项（医院术语）", width = 40, orderNum = "4")
+    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "4")
     private String criticalItemHisDetailName;
 
     /**

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

@@ -76,12 +76,13 @@ public class ResultOtherLis implements Serializable {
     /**
      * 其他开单项名称（医院端）
      */
-    @Excel(name = "实验室检查名称（医院术语））", width = 40, orderNum = "3")
+    @Excel(name = "实验室检查套餐名（医院术语））", width = 40, orderNum = "3")
     private String otherItemHisName;
 
     /**
      * 其他开单项名称-细项（医院端）
      */
+    @Excel(name = "实验室检查名称（医院术语））", width = 40, orderNum = "4")
     private String otherItemHisDetailName;
 
     /**
@@ -92,19 +93,19 @@ public class ResultOtherLis implements Serializable {
     /**
      * 提醒项类型
      */
-    @Excel(name = "禁忌项类型", width = 40, orderNum = "5")
+    @Excel(name = "禁忌项类型", width = 40, orderNum = "6")
     private String remindItemType;
 
     /**
      * 提醒项名称
      */
-    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "6")
+    @Excel(name = "禁忌项（标准术语）", width = 40, orderNum = "7")
     private String remindItemName;
 
     /**
      * 提醒项名称（医院端）
      */
-    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "7")
+    @Excel(name = "禁忌项（医院术语）", width = 40, orderNum = "8")
     private String remindItemHisName;
 
     /**
@@ -115,7 +116,7 @@ public class ResultOtherLis implements Serializable {
     /**
      * 输入值
      */
-    @Excel(name = "实验室检查数值", width = 40, orderNum = "4")
+    @Excel(name = "实验室检查数值", width = 40, orderNum = "5")
     private String inputValue;
 
     /**

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

@@ -70,13 +70,13 @@ public class ResultOtherTransfusion implements Serializable {
     /**
      * 其他开单项名称（医院端）
      */
-    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "3")
+    @Excel(name = "实验室检查套餐名（医院术语）", width = 40, orderNum = "3")
     private String otherItemHisName;
 
     /**
      * 其他开单项名称-细项（医院端）
      */
-    @Excel(name = "实验室检查名称-细项（医院术语）", width = 40, orderNum = "4")
+    @Excel(name = "实验室检查名称（医院术语）", width = 40, orderNum = "4")
     private String otherItemHisDetailName;
 
     /**

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

@@ -493,13 +493,17 @@ public class RuleConvertFacade {
                             resultMappingList.add(resultExt);
                         });
                     } else {
-                        resultMappingList.add(result);
+                        ResultCritical resultExt = new ResultCritical();
+                        BeanUtil.copyProperties(result, resultExt);
+                        resultMappingList.add(resultExt);
                     }
                 });
             } else {
                 result.setSuccess(0);
                 result.setMessage("开单项缺少医院端映射；");
-                resultMappingList.add(result);
+                ResultCritical resultExt = new ResultCritical();
+                BeanUtil.copyProperties(result, resultExt);
+                resultMappingList.add(resultExt);
             }
         }
 
@@ -544,11 +548,15 @@ public class RuleConvertFacade {
             if (hisMap != null && hisMap.size() > 0) {
                 hisMap.entrySet().forEach(entry -> {
                     result.setCriticalItemHisName(entry.getKey());
-                    resultMappingList.add(result);
+                    ResultCritical resultExt = new ResultCritical();
+                    BeanUtil.copyProperties(result, resultExt);
+                    resultMappingList.add(resultExt);
                 });
             } else {
                 result.setSuccess(0);
                 result.setMessage("开单项缺少医院端映射；");
+                ResultCritical resultExt = new ResultCritical();
+                BeanUtil.copyProperties(result, resultExt);
                 resultMappingList.add(result);
             }
         }
@@ -625,7 +633,9 @@ public class RuleConvertFacade {
             } else {
                 result.setSuccess(0);
                 result.setMessage("高危药品缺少医院端映射；");
-                retMappingList.add(result);
+                ResultHighriskDrug resultExt = new ResultHighriskDrug();
+                BeanUtil.copyProperties(result, resultExt);
+                retMappingList.add(resultExt);
             }
         }
 
@@ -911,14 +921,13 @@ public class RuleConvertFacade {
                                         ResultHighriskOperation pacsDescResult = new ResultHighriskOperation();
                                         BeanUtil.copyProperties(result, pacsDescResult);
                                         pacsDescResult.setFactorItemType(TypeEnum.pacsDecs.getName());
-                                        pacsDescResult.setFactorItemName("胸部CT");
-                                        pacsDescResult.setFactorItemHisName("胸部CT");
+                                        //pacsDescResult.setFactorItemName("胸部CT");
+                                        //pacsDescResult.setFactorItemHisName("胸部CT");
                                         pacsDescResult.setInputValue(subEntry.getKey());
                                         retOptList.add(pacsDescResult);
                                     }
                                 }
                             }
-
                         } else {
                             retOptList.add(result);
                         }
@@ -927,223 +936,6 @@ public class RuleConvertFacade {
             }
         }
 
-
-        //转换高危手术记录
-        /*Integer condIndex = 0;
-        for (YiBaoOperationName item : items) {
-            //非高危手术
-            if (StringUtil.isBlank(item.getOpgrade()) || item.getOpgrade().equals("0") || item.getOpgrade().equals("1")) {
-                continue;
-            }
-            ResultHighriskOperation result = new ResultHighriskOperation();
-            result.setHighriskItemName(item.getName());
-            result.setLevel(item.getOpgrade());
-            //带条件高危手术
-            if (item.getOpgrade().equals("2")) {
-                if (condMap == null || condMap.size() == 0 || StringUtil.isBlank(item.getHighriskcond())) {
-                    result.setSuccess(0);
-                    result.setMessage("缺少高危条件");
-                    retOptList.add(result);
-                    continue;
-                }
-                result.setFactorItemCond(item.getHighriskcond());
-                Map<String, Object> subCondMap = condMap.get(condIndex++);
-                if (condIndex.equals(condMap.size())) {
-                    condIndex = 0;
-                }
-                String type = subCondMap.get("type").toString();
-                if (type.equals(TypeEnum.age.getName())) {
-                    ResultHighriskOperation ageResult = new ResultHighriskOperation();
-                    BeanUtil.copyProperties(result, ageResult);
-                    ageResult.setFactorItemType(TypeEnum.age.getName());
-                    ageResult.setFactorItemName(subCondMap.get("name").toString());
-                    if (subCondMap.containsKey("最大值")) {
-                        ageResult.setFactorItemMaxValue((BigDecimal) subCondMap.get("最大值"));
-                    }
-                    if (subCondMap.containsKey("最小值")) {
-                        ageResult.setFactorItemMinValue((BigDecimal) subCondMap.get("最小值"));
-                    }
-                    if (subCondMap.containsKey("单位")) {
-                        ageResult.setFactorItemUnit(subCondMap.get("单位").toString());
-                    }
-                    if (subCondMap.containsKey("范围")) {
-                        ageResult.setFactorItemRange((Integer) subCondMap.get("范围"));
-                    }
-                    retOptList.add(ageResult);
-                } else if (type.equals(TypeEnum.vital.getName())) {
-                    ResultHighriskOperation vitalResult = new ResultHighriskOperation();
-                    BeanUtil.copyProperties(result, vitalResult);
-                    vitalResult.setFactorItemName(subCondMap.get("name").toString());
-                    vitalResult.setFactorItemType(TypeEnum.vital.getName());
-                    if (subCondMap.containsKey("最大值")) {
-                        vitalResult.setFactorItemMaxValue((BigDecimal) subCondMap.get("最大值"));
-                    }
-                    if (subCondMap.containsKey("最小值")) {
-                        vitalResult.setFactorItemMinValue((BigDecimal) subCondMap.get("最小值"));
-                    }
-                    if (subCondMap.containsKey("单位")) {
-                        vitalResult.setFactorItemUnit((String) subCondMap.get("单位"));
-                    }
-                    if (subCondMap.containsKey("范围")) {
-                        vitalResult.setFactorItemRange((Integer) subCondMap.get("范围"));
-                    }
-                    retOptList.add(vitalResult);
-                } else if (type.equals(TypeEnum.disease.getName())) {
-                    ResultHighriskOperation diagResult = new ResultHighriskOperation();
-                    BeanUtil.copyProperties(result, diagResult);
-                    diagResult.setFactorItemType(TypeEnum.disease.getName());
-                    diagResult.setFactorItemName(subCondMap.get("name").toString());
-                    retOptList.add(diagResult);
-                } else if (type.equals(TypeEnum.lis.getName())) {
-                    ResultHighriskOperation lisResult = new ResultHighriskOperation();
-                    BeanUtil.copyProperties(result, lisResult);
-                    lisResult.setFactorItemType(TypeEnum.lis.getName());
-                    lisResult.setFactorItemName(subCondMap.get("name").toString());
-                    if (subCondMap.containsKey("最大值")) {
-                        lisResult.setFactorItemMaxValue((BigDecimal) subCondMap.get("最大值"));
-                    }
-                    if (subCondMap.containsKey("最小值")) {
-                        lisResult.setFactorItemMinValue((BigDecimal) subCondMap.get("最小值"));
-                    }
-                    if (subCondMap.containsKey("单位")) {
-                        lisResult.setFactorItemUnit((String) subCondMap.get("单位"));
-                    }
-                    if (subCondMap.containsKey("范围")) {
-                        lisResult.setFactorItemRange((Integer) subCondMap.get("范围"));
-                    }
-                    if (subCondMap.containsKey("结果")) {
-                        lisResult.setInputValue((String) subCondMap.get("结果"));
-                    }
-                    retOptList.add(lisResult);
-                } else if (type.equals(TypeEnum.pacsDecs.getName())) {
-                    ResultHighriskOperation pacsDescResult = new ResultHighriskOperation();
-                    BeanUtil.copyProperties(result, pacsDescResult);
-                    pacsDescResult.setFactorItemType(TypeEnum.pacsDecs.getName());
-                    pacsDescResult.setInputValue(subCondMap.get("name").toString());
-                    retOptList.add(pacsDescResult);
-                }*/
-               /* String highriskcond = item.getHighriskcond();
-                JSONObject jobj = JSONObject.parseObject(highriskcond);
-                if (null != jobj) {
-                    // 判断年龄
-                    JSONObject ageobj = jobj.getJSONObject("年龄");
-                    if (ageobj != null) {
-                        ResultHighriskOperation ageResult = new ResultHighriskOperation();
-                        BeanUtil.copyProperties(result, ageResult);
-                        ageResult.setFactorItemType(TypeEnum.age.getName());
-                        ageResult.setFactorItemName("年龄");
-                        if (ageobj.containsKey("最大值")) {
-                            ageResult.setFactorItemMaxValue(ageobj.getBigDecimal("最大值"));
-                        }
-                        if (ageobj.containsKey("最小值")) {
-                            ageResult.setFactorItemMinValue(ageobj.getBigDecimal("最小值"));
-                        }
-                        if (ageobj.containsKey("单位")) {
-                            ageResult.setFactorItemUnit(ageobj.getString("单位"));
-                        }
-                        if (ageobj.containsKey("范围")) {
-                            ageResult.setFactorItemRange(ageobj.getInteger("范围"));
-                        }
-                        retOptList.add(ageResult);
-                    }
-                    // 判断生命体征和查体
-                    JSONObject vitalObj = jobj.getJSONObject("生命体征及查体");
-                    if (null != vitalObj) {
-                        for (Map.Entry<String, Object> entry : vitalObj.entrySet()) {
-                            ResultHighriskOperation vitalResult = new ResultHighriskOperation();
-                            BeanUtil.copyProperties(result, vitalResult);
-                            vitalResult.setFactorItemName(entry.getKey());
-                            vitalResult.setFactorItemType(TypeEnum.vital.getName());
-                            if (ObjectUtils.isEmpty(entry.getValue())) {
-                                retOptList.add(vitalResult);
-                                continue;
-                            }
-                            JSONObject subVitalObj = (JSONObject) entry.getValue();
-                            if (null != subVitalObj) {
-                                if (subVitalObj.containsKey("最大值")) {
-                                    vitalResult.setFactorItemMaxValue(subVitalObj.getBigDecimal("最大值"));
-                                }
-                                if (subVitalObj.containsKey("最小值")) {
-                                    vitalResult.setFactorItemMinValue(subVitalObj.getBigDecimal("最小值"));
-                                }
-                                if (subVitalObj.containsKey("单位")) {
-                                    vitalResult.setFactorItemUnit(subVitalObj.getString("单位"));
-                                }
-                                if (subVitalObj.containsKey("范围")) {
-                                    vitalResult.setFactorItemRange(subVitalObj.getInteger("范围"));
-                                }
-                            }
-                            retOptList.add(vitalResult);
-                        }
-                    }
-
-                    // 判断合并疾病
-                    JSONObject diagobj = jobj.getJSONObject("合并疾病");
-                    if (null != diagobj) {
-                        for (Map.Entry<String, Object> entry : diagobj.entrySet()) {
-                            ResultHighriskOperation diagResult = new ResultHighriskOperation();
-                            BeanUtil.copyProperties(result, diagResult);
-                            diagResult.setFactorItemType(TypeEnum.disease.getName());
-                            diagResult.setFactorItemName(entry.getKey());
-                            retOptList.add(diagResult);
-                        }
-                    }
-
-                    // 判断化验结果
-                    JSONObject lisobj = jobj.getJSONObject("化验结果");
-                    if (null != lisobj) {
-                        for (Map.Entry<String, Object> entry : lisobj.entrySet()) {
-                            ResultHighriskOperation lisResult = new ResultHighriskOperation();
-                            BeanUtil.copyProperties(result, lisResult);
-                            lisResult.setFactorItemType(TypeEnum.lis.getName());
-                            lisResult.setFactorItemName(entry.getKey());
-                            if (ObjectUtils.isEmpty(entry.getValue())) {
-                                retOptList.add(lisResult);
-                                continue;
-                            }
-                            JSONObject subLisObj = (JSONObject) entry.getValue();
-                            if (null != subLisObj) {
-                                if (subLisObj.containsKey("最大值")) {
-                                    lisResult.setFactorItemMaxValue(subLisObj.getBigDecimal("最大值"));
-                                }
-                                if (subLisObj.containsKey("最小值")) {
-                                    lisResult.setFactorItemMinValue(subLisObj.getBigDecimal("最小值"));
-                                }
-                                if (subLisObj.containsKey("单位")) {
-                                    lisResult.setFactorItemUnit(subLisObj.getString("单位"));
-                                }
-                                if (subLisObj.containsKey("范围")) {
-                                    lisResult.setFactorItemRange(subLisObj.getInteger("范围"));
-                                }
-                                if (subLisObj.containsKey("结果")) {
-                                    lisResult.setInputValue(subLisObj.getString("结果"));
-                                }
-                            }
-                            retOptList.add(lisResult);
-                        }
-                    }
-
-                    // 判断辅检结果，暂不处理
-                    JSONObject pacsObj = jobj.getJSONObject("辅检结果");
-                    // 判断辅检结果描述
-                    JSONObject pacsDescObj = jobj.getJSONObject("辅检结果描述");
-                    if (null != pacsDescObj) {
-                        for (Map.Entry<String, Object> entry : pacsDescObj.entrySet()) {
-                            ResultHighriskOperation pacsDescResult = new ResultHighriskOperation();
-                            BeanUtil.copyProperties(result, pacsDescResult);
-                            pacsDescResult.setFactorItemType(TypeEnum.pacsDecs.getName());
-                            pacsDescResult.setFactorItemName("胸部CT");
-                            pacsDescResult.setFactorItemHisName("胸部CT");
-                            pacsDescResult.setInputValue(entry.getKey());
-                            retOptList.add(pacsDescResult);
-                        }
-                    }
-                }*/
-           /* } else {
-                retOptList.add(result);
-            }
-        }*/
-
         //手术名称映射
         for (ResultHighriskOperation result : retOptList) {
             Map<String, List<Long>> subMap = operationConfigMap.get(result.getHighriskItemName());
@@ -1181,9 +973,10 @@ public class RuleConvertFacade {
                     result.setSuccess(0);
                     result.setMessage((StringUtil.isNotBlank(result.getMessage()) ? result.getMessage() : "") +
                             "高危手术条件缺少医院端映射；");
-                    retFactorMappingList.add(result);
+                    ResultHighriskOperation resultExt = new ResultHighriskOperation();
+                    BeanUtil.copyProperties(result, resultExt);
+                    retFactorMappingList.add(resultExt);
                 }
-
             } else if (result.getFactorItemType().equals(TypeEnum.lis.getName())) {
                 Map<String, Map<String, List<Long>>> subMap = lisConfigMap.get(result.getFactorItemName());
                 if (subMap != null && subMap.size() > 0) {
@@ -1204,7 +997,9 @@ public class RuleConvertFacade {
                     result.setSuccess(0);
                     result.setMessage((StringUtil.isNotBlank(result.getMessage()) ? result.getMessage() : "") +
                             "高危手术条件缺少医院端映射；");
-                    retFactorMappingList.add(result);
+                    ResultHighriskOperation resultExt = new ResultHighriskOperation();
+                    BeanUtil.copyProperties(result, resultExt);
+                    retFactorMappingList.add(resultExt);
                 }
             } else {
                 retFactorMappingList.add(result);