更新开单合理性的返回节点名称处理方式

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

@@ -5,6 +5,7 @@ import com.diagbot.entity.relationship.*;
 import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.util.HashSet;
@@ -15,6 +16,17 @@ import java.util.Set;
 @NodeEntity(label = "禁忌人群")
 public class Group extends BaseNode  {
 
+	@Property(name = "单位")
+	private String unit;
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "禁忌人群指标")
+	private String groupidx;
 
 	@Relationship(type = "实验室检查名称禁忌禁忌人群", direction = Relationship.INCOMING)
 	private Set<LisNameGroup> lisnameGroups = new HashSet<>();

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

@@ -30,6 +30,9 @@ public class Lis extends BaseNode  {
 	@Property(name = "范围")
 	private Integer range;
 
+	@Property(name = "实验室检查指标")
+	private String lisidx;
+
 	@Relationship(type = "医保手术和操作名称禁忌实验室检查", direction = Relationship.INCOMING)
 	private Set<YiBaoOperationNameLis> yibaooperationnameLis = new HashSet<>();
 

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

@@ -30,7 +30,7 @@ public class Vital extends BaseNode  {
 	private Integer range;
 
 	@Property(name = "体征指标")
-	private String vitalname;
+	private String vitalidx;
 
 	@Relationship(type = "辅助检查名称禁忌体征", direction = Relationship.INCOMING)
 	private Set<PacsNameVital> pacsVitals = new HashSet<>();

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

@@ -49,7 +49,7 @@ public class CombiOperationNode {
 				if (NeoUtil.isExist(combiOplis.getLis())) {
 					Lis lis = combiOplis.getLis();
 					nodeInfo = new NodeInfo();
-					nodeInfo.setName(lis.getName());
+					nodeInfo.setName(lis.getLisidx());
 					nodeInfo.setTypeval(Constants.lis);
 					combiOpBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
 				}

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

@@ -3,9 +3,7 @@ package com.diagbot.repository;
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.PacsBillNeoDTO;
 import com.diagbot.entity.BaseNodeInfo;
-import com.diagbot.entity.node.BillConflictItem;
-import com.diagbot.entity.node.ClinicalFinding;
-import com.diagbot.entity.node.PacsName;
+import com.diagbot.entity.node.*;
 import com.diagbot.entity.relationship.*;
 import com.diagbot.entity.relationship.base.BaseRelation;
 import com.diagbot.util.ListUtil;
@@ -51,16 +49,17 @@ public class PacsNameNode {
 
 
         Set<PacsNameVital> pacsNamevitals = pacs.getPacsNameVitals();
-        for (PacsNameVital vital : pacsNamevitals) {
-            if (NeoUtil.isExist(vital)) {
-                if (NeoUtil.isExist(vital.getVital())) {
+        for (PacsNameVital PNvital : pacsNamevitals) {
+            if (NeoUtil.isExist(PNvital)) {
+                if (NeoUtil.isExist(PNvital.getVital())) {
                     nodeInfo = new NodeInfo();
-                    String name = vital.getVital().getName();
+                    Vital vital = PNvital.getVital();
+                    String name = (vital.getVitalidx()==null)?vital.getName():vital.getVitalidx();
                     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.setMinval(NeoUtil.DoubletoBigDecimal(vital.getMinval()));
+                    nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getMaxval()));
+                    nodeInfo.setUnit(vital.getUnit());
+                    nodeInfo.setRange(vital.getRange());
                     nodeInfo.setTypeval(Constants.vital);
                     pacsBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(nodeInfo));
                 }
@@ -73,7 +72,7 @@ public class PacsNameNode {
             if (NeoUtil.isExist(lis)) {
                 if (NeoUtil.isExist(lis.getLis())) {
                     nodeInfo = new NodeInfo();
-                    nodeInfo.setName(lis.getLis().getName());
+                    nodeInfo.setName(lis.getLis().getLisidx());
                     nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMinval()));
                     nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMaxval()));
                     nodeInfo.setUnit(lis.getLis().getUnit());
@@ -99,11 +98,13 @@ public class PacsNameNode {
 
 
         Set<PacsNameGroup> pacsNamegroups = pacs.getPacsNameGroups();
-        for (PacsNameGroup group : pacsNamegroups) {
-            if (NeoUtil.isExist(group)) {
-                if (NeoUtil.isExist(group.getGroup())) {
+        for (PacsNameGroup PNgroup : pacsNamegroups) {
+            if (NeoUtil.isExist(PNgroup)) {
+                if (NeoUtil.isExist(PNgroup.getGroup())) {
                     nodeInfo = new NodeInfo();
-                    nodeInfo.setName(group.getGroup().getName());
+                    Group group = PNgroup.getGroup();
+                    String name = (group.getGroupidx()==null)?group.getName():group.getGroupidx();
+                    nodeInfo.setName(name);
                     nodeInfo.setTypeval(Constants.group);
                     pacsBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
                 }

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

@@ -50,7 +50,7 @@ public class PacsSubNameNode {
         for (PacsSubNameVital vital : vitals) {
             if (NeoUtil.isExist(vital.getVital())) {
                 nodeInfo = new NodeInfo();
-                String name = vital.getVital().getName();
+                String name = vital.getVital().getVitalidx();
                 nodeInfo.setName(name);
                 nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getVital().getMinval()));
                 nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getVital().getMaxval()));
@@ -66,7 +66,7 @@ public class PacsSubNameNode {
         for (PacsSubNameLis lis : liss) {
             if (NeoUtil.isExist(lis.getLis())) {
                 nodeInfo = new NodeInfo();
-                nodeInfo.setName(lis.getLis().getName());
+                nodeInfo.setName(lis.getLis().getLisidx());
                 nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMinval()));
                 nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(lis.getLis().getMaxval()));
                 nodeInfo.setUnit(lis.getLis().getUnit());

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

@@ -75,7 +75,7 @@ public class YiBaoOperationNameNode {
                 if (NeoUtil.isExist(yiBaoOperationNamevital.getVital())) {
                     Vital vital = yiBaoOperationNamevital.getVital();
                     nodeInfo = new NodeInfo();
-                    String name = vital.getName();
+                    String name = vital.getVitalidx();
                     nodeInfo.setName(name);
                     nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getMinval()));
                     nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getMaxval()));
@@ -93,7 +93,7 @@ public class YiBaoOperationNameNode {
                 if (NeoUtil.isExist(yiBaoOperationNameLis.getLis())) {
                     Lis lis = yiBaoOperationNameLis.getLis();
                     nodeInfo = new NodeInfo();
-                    nodeInfo.setName(lis.getName());
+                    nodeInfo.setName(lis.getLisidx());
                     nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(lis.getMinval()));
                     nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(lis.getMaxval()));
                     nodeInfo.setUnit(lis.getUnit());
@@ -135,8 +135,9 @@ public class YiBaoOperationNameNode {
             if (NeoUtil.isExist(conflict_group)) {
                 if (NeoUtil.isExist(conflict_group.getGroup())) {
                     Group group = conflict_group.getGroup();
+                    String name = (group.getGroupidx()==null)?group.getName():group.getGroupidx();
                     nodeInfo = new NodeInfo();
-                    nodeInfo.setName(group.getName());
+                    nodeInfo.setName(name);
                     nodeInfo.setTypeval(Constants.group);
                     opBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
                 }

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

@@ -30,7 +30,7 @@ public class NeoUtil {
 
         String name = nodeInfo.getName();
         name = (null==name)?"":name;
-        name = datautil.removekey(name, Constants.conflict);
+//        name = datautil.removekey(name, Constants.conflict);
         nodeNeoDTO.setName(name);
 
         BigDecimal min = nodeInfo.getMinval();
@@ -243,7 +243,7 @@ public class NeoUtil {
 
         nodeNeoDTO.setUnit(vital.getUnit());
 
-        nodeNeoDTO.setTermtype(vital.getVitalname());
+        nodeNeoDTO.setTermtype(vital.getVitalidx());
 
         return nodeNeoDTO;
     }