更新药物过敏源和过敏药物相关的DTO输出结构

src/main/java/com/diagbot/dto/TransfusionBillNeoDTO.java

@@ -34,7 +34,7 @@ public class TransfusionBillNeoDTO {
     private List<NodeNeoDTO> pacs = new ArrayList<>();
 
     // 禁忌过敏药品
-    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
+//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
 
     // 禁忌服用药品
     private List<NodeNeoDTO> oralmeds = new ArrayList<>();

src/main/java/com/diagbot/repository/Constants.java

@@ -3,6 +3,7 @@ package com.diagbot.repository;
 public class Constants {
 
     public static String yaoping = "药品";
+    public static String yaopingleibie = "药品类别";
     public static String shoushu = "手术";
     public static String huayan = "化验";
     public static String fujian = "辅检";

src/main/java/com/diagbot/repository/MedicineCodeNode.java

@@ -87,7 +87,7 @@ public class MedicineCodeNode {
         for (MedZhiLiaoClass medZhiLiaoCls : medZhiLiaoClasses) {
             nodeInfo = new NodeInfo();
             nodeInfo.setName(medZhiLiaoCls.getName());
-            nodeInfo.setTypeval(Constants.medzhiliao);
+            nodeInfo.setTypeval(NeoUtil.getMedType(medZhiLiaoCls.getName()));
             drugBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
         }
 

src/main/java/com/diagbot/repository/PacsNameNode.java

@@ -109,7 +109,7 @@ public class PacsNameNode {
         for (MedAllergen medAllergen : medAllergens) {
             nodeInfo = new NodeInfo();
             nodeInfo.setName(medAllergen.getName());
-            nodeInfo.setTypeval(Constants.medallergen);
+            nodeInfo.setTypeval(NeoUtil.getMedType(medAllergen.getName()));
             pacsBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
         }
 

src/main/java/com/diagbot/repository/YiBaoOperationNameNode.java

@@ -107,7 +107,7 @@ public class YiBaoOperationNameNode {
         for (MedAllergen medAllergen : conflict_medallegen) {
             nodeInfo = new NodeInfo();
             nodeInfo.setName(medAllergen.getName());
-            nodeInfo.setTypeval(Constants.medallergen);
+            nodeInfo.setTypeval(NeoUtil.getMedType(medAllergen.getName()));
             opBillNeoDTO.getMedallegen().add(NeoUtil.updateNodeInfo(nodeInfo));
         }
 

src/main/java/com/diagbot/util/NeoUtil.java

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
 
 public class NeoUtil {
 
+    private static String regex = "(.*)\\([a-zA-Z0-9]+\\)";
+
     public static NodeNeoDTO updateNodeInfo(NodeInfo nodeInfo) {
         NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
 
@@ -109,4 +111,14 @@ public class NeoUtil {
             return nodeNeoDTO;
         }
     }
+
+
+    public static String getMedType(String medname) {
+        String medtype = Constants.yaoping;
+        if (medname.matches(regex)) {
+            medtype = Constants.yaopingleibie;
+        }
+
+        return medtype;
+    }
 }