危急值高危测试

src/main/java/com/diagbot/aggregate/IndicationTestAggregate.java

@@ -81,9 +81,9 @@ public class IndicationTestAggregate {
     public Map<String, Object> t3(@InvokeParameter("mapPath") Map<String, String> mapPath) {
         Map<String, Object> map = new LinkedHashMap<>();
 
-        MultipartFile file = testFacade.getMulFileByPath(mapPath.get("【高危手术】"));
+        MultipartFile file = testFacade.getMulFileByPath(mapPath.get("【高危手术整合】"));
         Map<String, Object> highOperationMap = testFacade.testHighRiskOperationExcel(file, new TestLineVO());
-        map.put("【高危手术】",highOperationMap);
+        map.put("【高危手术整合】",highOperationMap);
         return map;
     }
 

src/main/java/com/diagbot/facade/TestFacade.java

@@ -449,7 +449,7 @@ public class TestFacade {
             Lis lis = new Lis();
             lis.setName("套餐");
             lis.setDetailName("明细");
-            lis.setUniqueName(bean.getOtherTipLisName());
+            lis.setUniqueName(bean.getLisGBName());
             lis.setValue(getValue(bean.getSymbol(), bean.getValue()));
             lisList.add(lis);
             indicationPushVO.setLis(lisList);
@@ -643,12 +643,12 @@ public class TestFacade {
                 List<Lis> lisDetail = new ArrayList<>();
                 Lis lisDetailBean = new Lis();
                 lisDetailBean.setName(bean.getCriticalMeal());
-                lisDetailBean.setDetailName(bean.getCriticalLis());
-                lisDetailBean.setUniqueName(bean.getCriticalLis());
+                lisDetailBean.setDetailName(bean.getLisGBName());
+                lisDetailBean.setUniqueName(bean.getLisGBName());
                 lisDetailBean.setValue(bean.getCriticalMin());
                 lisDetail.add(lisDetailBean);
                 copy.setLis(lisDetail);
-                copy.setMsg(bean.getCriticalLis() + "【低危急值】");
+                copy.setMsg(bean.getLisGBName() + "【低危急值】");
                 indicationPushVOList.add(copy);
             }
             if (bean.getCriticalMax() != null) {
@@ -657,12 +657,12 @@ public class TestFacade {
                 List<Lis> lisDetail = new ArrayList<>();
                 Lis lisDetailBean = new Lis();
                 lisDetailBean.setName(bean.getCriticalMeal());
-                lisDetailBean.setDetailName(bean.getCriticalLis());
-                lisDetailBean.setUniqueName(bean.getCriticalLis());
+                lisDetailBean.setDetailName(bean.getLisGBName());
+                lisDetailBean.setUniqueName(bean.getLisGBName());
                 lisDetailBean.setValue(bean.getCriticalMax());
                 lisDetail.add(lisDetailBean);
                 copy.setLis(lisDetail);
-                copy.setMsg(bean.getCriticalLis() + "【高危急值】");
+                copy.setMsg(bean.getLisGBName() + "【高危急值】");
                 indicationPushVOList.add(copy);
             }
         }
@@ -1121,12 +1121,12 @@ public class TestFacade {
         Map<String, Object> paramMap = new LinkedHashMap<>();
         Map<String, String> mapPath = new LinkedHashMap<>();
         mapPath.put("【危急值_化验】", path + File.separator + "【危急值_化验】.xlsx");
-        mapPath.put("【危急值_辅检】", path + File.separator + "【危急值_辅检】.xls");
+        mapPath.put("【危急值_辅检】", path + File.separator + "【危急值_辅检】.xlsx");
         mapPath.put("【其他值提醒_化验】", path + File.separator + "【其他值提醒_化验】.xlsx");
         mapPath.put("【其他值提醒_辅检】", path + File.separator + "【其他值提醒_辅检】.xlsx");
         mapPath.put("【其他值提醒_输血】", path + File.separator + "【其他值提醒_输血】.xlsx");
         mapPath.put("【高危药品】", path + File.separator + "【高危药品】.xlsx");
-        mapPath.put("【高危手术】", path + File.separator + "【高危手术】.xlsx");
+        mapPath.put("【高危手术整合】", path + File.separator + "【高危手术整合】.xlsx");
         mapPath.put("【开单合理性】", path + File.separator + "【开单合理性】.xlsx");
         mapPath.put("【开单合理性_输血】", path + File.separator + "【开单合理性_输血】.xlsx");
         paramMap.put("mapPath", mapPath);

src/main/java/com/diagbot/vo/TestIndicationVO.java

@@ -188,8 +188,6 @@ public class TestIndicationVO implements Serializable {
     private String transfusionNodeName;
     @Excel(name="实验室检查套餐")
     private String criticalMeal;
-    @Excel(name="实验室检查")
-    private String criticalLis;
     @Excel(name="低危急值")
     private Double criticalMin;
     @Excel(name="高危急值")
@@ -205,7 +203,7 @@ public class TestIndicationVO implements Serializable {
     @Excel(name="注册剂型")
     private String drugForm;
     @Excel(name="实验室检查名称")
-    private String otherTipLisName;
+    private String lisGBName;
     @Excel(name="比较符号")
     private String symbol;
     @Excel(name="数值")