Browse Source

修改开单合理性返回项目名称的处理方法

MarkHuang 4 years ago
parent
commit
1222f87fe6

+ 2 - 1
src/main/java/com/diagbot/repository/Constants.java

@@ -1,7 +1,8 @@
 package com.diagbot.repository;
 
 public class Constants {
-    
+
+    public static String conflict = "禁忌";
     public static String age = "年龄";
     public static String allergicmed = "过敏药品";
 //    public static String clinicalfinding = "临床表现";

+ 0 - 3
src/main/java/com/diagbot/repository/PacsNameNode.java

@@ -43,9 +43,6 @@ public class PacsNameNode {
         for (Vital vital : vitals) {
             nodeInfo = new NodeInfo();
             String name = vital.getName();
-            if (name.contains("禁忌")) {
-                name = name.substring(name.indexOf("禁忌")+2);
-            }
             nodeInfo.setName(name);
             nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getMinval()));
             nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getMaxval()));

+ 0 - 3
src/main/java/com/diagbot/repository/YiBaoOperationNameNode.java

@@ -46,9 +46,6 @@ public class YiBaoOperationNameNode {
         for (Vital vital : vitals) {
             nodeInfo = new NodeInfo();
             String name = vital.getName();
-            if (name.contains("禁忌")) {
-                name = name.substring(name.indexOf("禁忌")+2);
-            }
             nodeInfo.setName(name);
             nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getMinval()));
             nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getMaxval()));

+ 13 - 0
src/main/java/com/diagbot/repository/datautil.java

@@ -0,0 +1,13 @@
+package com.diagbot.repository;
+
+public class datautil {
+
+    public static String removekey(String name, String key) {
+
+        if (name.contains(key)) {
+            name = name.substring(name.indexOf(key)+key.length());
+        }
+
+        return name;
+    }
+}

+ 3 - 0
src/main/java/com/diagbot/util/NeoUtil.java

@@ -2,7 +2,9 @@ package com.diagbot.util;
 
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.PushBaseDTO;
+import com.diagbot.repository.Constants;
 import com.diagbot.repository.NodeInfo;
+import com.diagbot.repository.datautil;
 
 import java.math.BigDecimal;
 
@@ -13,6 +15,7 @@ public class NeoUtil {
 
         String name = nodeInfo.getName();
         name = (null==name)?"":name;
+        name = datautil.removekey(name, Constants.conflict);
         nodeNeoDTO.setName(name);
 
         BigDecimal min = nodeInfo.getMinval();