Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/entity/node/MedAllergen.java

@@ -20,7 +20,7 @@ public class MedAllergen extends BaseNode  {
 	private String medtype;
 
 	@Relationship(type = "辅助检查名称禁忌药物过敏原", direction = Relationship.INCOMING)
-	private Set<PacsMedAllergen> pacsMedAllergens = new HashSet<>();
+	private Set<PacsNameMedAllergen> pacsMedAllergens = new HashSet<>();
 
 	@Relationship(type = "医保手术和操作名称禁忌药物过敏原", direction = Relationship.INCOMING)
 	private Set<YiBaoOperationNameMedAllergen> yibaooperationnameMedAllergens = new HashSet<>();

src/main/java/com/diagbot/entity/relationship/PacsMedAllergen.java

@@ -1,18 +0,0 @@
-package com.diagbot.entity.relationship;
-
-import com.diagbot.entity.node.PacsName;
-import com.diagbot.entity.node.MedAllergen;
-import com.diagbot.entity.relationship.base.BaseRelation;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.*;
-
-@Getter
-@Setter@RelationshipEntity(type = "辅助检查名称禁忌药物过敏原")
-public class PacsMedAllergen extends BaseRelation {
-    @StartNode
-    private PacsName pacsName;
-
-    @EndNode
-    private MedAllergen medAllergen;
-}

src/main/java/com/diagbot/entity/relationship/PacsNameMedAllergen.java

@@ -8,7 +8,8 @@ import lombok.Setter;
 import org.neo4j.ogm.annotation.*;
 
 @Getter
-@Setter@RelationshipEntity(type = "辅助检查名称禁忌药物过敏原")
+@Setter
+@RelationshipEntity(type = "辅助检查名称禁忌药物过敏原")
 public class PacsNameMedAllergen extends BaseRelation {
     @StartNode
     private PacsName pacsName;

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

@@ -44,113 +44,135 @@ public class PacsNameNode {
 
         Set<PacsNameClinicalFinding> pacsNameclinicalfindings = pacs.getPacsNameClinicalfindings();
         for (PacsNameClinicalFinding clinicalfinding : pacsNameclinicalfindings) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(clinicalfinding.getClinicalFinding().getName());
-            nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(clinicalfinding.getClinicalFinding().getMinval()));
-            nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(clinicalfinding.getClinicalFinding().getMaxval()));
-            nodeInfo.setUnit(clinicalfinding.getClinicalFinding().getUnit());
-            nodeInfo.setRange(clinicalfinding.getClinicalFinding().getRange());
-            nodeInfo.setTypeval(Constants.clinicalfinding);
-            pacsBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(clinicalfinding)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(clinicalfinding.getClinicalFinding().getName());
+                nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(clinicalfinding.getClinicalFinding().getMinval()));
+                nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(clinicalfinding.getClinicalFinding().getMaxval()));
+                nodeInfo.setUnit(clinicalfinding.getClinicalFinding().getUnit());
+                nodeInfo.setRange(clinicalfinding.getClinicalFinding().getRange());
+                nodeInfo.setTypeval(Constants.clinicalfinding);
+                pacsBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameVital> pacsNamevitals = pacs.getPacsNameVitals();
         for (PacsNameVital vital : pacsNamevitals) {
-            nodeInfo = new NodeInfo();
-            String name = vital.getVital().getName();
-            nodeInfo.setName(name);
-            nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getVital().getMinval()));
-            nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getVital().getMaxval()));
-            nodeInfo.setUnit(vital.getVital().getUnit());
-            nodeInfo.setRange(vital.getVital().getRange());
-            nodeInfo.setTypeval(Constants.vital);
-            pacsBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(vital)) {
+                nodeInfo = new NodeInfo();
+                String name = vital.getVital().getName();
+                nodeInfo.setName(name);
+                nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getVital().getMinval()));
+                nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getVital().getMaxval()));
+                nodeInfo.setUnit(vital.getVital().getUnit());
+                nodeInfo.setRange(vital.getVital().getRange());
+                nodeInfo.setTypeval(Constants.vital);
+                pacsBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameLis> pacsNameliss = pacs.getPacsNameLis();
         for (PacsNameLis lis : pacsNameliss) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(lis.getLis().getName());
-            nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMinval()));
-            nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMaxval()));
-            nodeInfo.setUnit(lis.getLis().getUnit());
-            nodeInfo.setRange(lis.getLis().getRange());
-            nodeInfo.setTypeval(Constants.lis);
-            pacsBillNeoDTO.getLis().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(lis)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(lis.getLis().getName());
+                nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMinval()));
+                nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMaxval()));
+                nodeInfo.setUnit(lis.getLis().getUnit());
+                nodeInfo.setRange(lis.getLis().getRange());
+                nodeInfo.setTypeval(Constants.lis);
+                pacsBillNeoDTO.getLis().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNamePacsDescribe> pacsNameconflict_pacsdesc = pacs.getPacsNamePacsdescribes();
         for (PacsNamePacsDescribe pacsdesc : pacsNameconflict_pacsdesc) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(pacsdesc.getPacsDescribe().getName());
-            nodeInfo.setTypeval(Constants.pacsdesc);
-            pacsBillNeoDTO.getPacsDesc().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(pacsdesc)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(pacsdesc.getPacsDescribe().getName());
+                nodeInfo.setTypeval(Constants.pacsdesc);
+                pacsBillNeoDTO.getPacsDesc().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameGroup> pacsNamegroups = pacs.getPacsNameGroups();
         for (PacsNameGroup group : pacsNamegroups) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(group.getGroup().getName());
-            nodeInfo.setTypeval(Constants.group);
-            pacsBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(group)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(group.getGroup().getName());
+                nodeInfo.setTypeval(Constants.group);
+                pacsBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameOralMedicine> pacsNameconflict_medicines = pacs.getPacsNameOralmedicines();
         for (PacsNameOralMedicine conflict_medicine : pacsNameconflict_medicines) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(conflict_medicine.getOralMedicine().getName());
-            nodeInfo.setTypeval(Constants.yaoping);
-            pacsBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(conflict_medicine)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(conflict_medicine.getOralMedicine().getName());
+                nodeInfo.setTypeval(Constants.yaoping);
+                pacsBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameMedAllergen> pacsNamemedAllergens = pacs.getPacsNameMedallergens();
         for (PacsNameMedAllergen medAllergen : pacsNamemedAllergens) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(medAllergen.getMedAllergen().getName());
-            nodeInfo.setTypeval(NeoUtil.getMedType(medAllergen.getMedAllergen().getName()));
-            pacsBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(medAllergen)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(medAllergen.getMedAllergen().getName());
+                nodeInfo.setTypeval(NeoUtil.getMedType(medAllergen.getMedAllergen().getName()));
+                pacsBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameDisease> pacsNamediseases = pacs.getPacsNameDiseases();
         for (PacsNameDisease disease : pacsNamediseases) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(disease.getDisease().getName());
-            nodeInfo.setTypeval(Constants.disease);
-            pacsBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(disease)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(disease.getDisease().getName());
+                nodeInfo.setTypeval(Constants.disease);
+                pacsBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameAllergen> pacsNameallergens = pacs.getPacsNameAllergens();
         for (PacsNameAllergen allergen : pacsNameallergens) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(allergen.getAllergen().getName());
-            nodeInfo.setTypeval(Constants.yaoping); // 过敏原归类成药物过敏原，与模型提取匹配
-            pacsBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(allergen)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(allergen.getAllergen().getName());
+                nodeInfo.setTypeval(Constants.yaoping); // 过敏原归类成药物过敏原，与模型提取匹配
+                pacsBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNameConflictDevice> pacsNameconflictDevices = pacs.getPacsNameConflictdevices();
         for (PacsNameConflictDevice conflictDevice : pacsNameconflictDevices) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(conflictDevice.getConflictDevice().getName());
-            nodeInfo.setTypeval(Constants.conflictdevice);
-            pacsBillNeoDTO.getMeddevice().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(conflictDevice)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(conflictDevice.getConflictDevice().getName());
+                nodeInfo.setTypeval(Constants.conflictdevice);
+                pacsBillNeoDTO.getMeddevice().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
 
         Set<PacsNamePacsName> pacsNamepacsNames = pacs.getConflictPacsName_out();
         for (PacsNamePacsName pacsName : pacsNamepacsNames) {
-            nodeInfo = new NodeInfo();
-            nodeInfo.setName(pacsName.getConflict_pacsName().getName());
-            nodeInfo.setTypeval(Constants.fujian);
-            pacsBillNeoDTO.getPacsOrder().add(NeoUtil.updateNodeInfo(nodeInfo));
+            if (NeoUtil.isExist(pacsName)) {
+                nodeInfo = new NodeInfo();
+                nodeInfo.setName(pacsName.getConflict_pacsName().getName());
+                nodeInfo.setTypeval(Constants.fujian);
+                pacsBillNeoDTO.getPacsOrder().add(NeoUtil.updateNodeInfo(nodeInfo));
+            }
         }
 
         return pacsBillNeoDTO;

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

@@ -263,6 +263,19 @@ public class StringUtil {
         return isWord;
     }
 
+    /**
+     * 中文符号转为英文
+     * @param token
+     */
+    public static String zhtoen(String token) {
+        token = token.replaceAll("（","(");
+        token = token.replaceAll("）",")");
+        token = token.replaceAll("，",",");
+        token = token.replaceAll("；",";");
+
+        return token;
+    }
+
     // 测试主函数
     public static void main(String args[]) {
         System.out.println(StringUtil.isWord("  "));