更新开单合理性，在对接的数据结构中添加体征

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

@@ -21,6 +21,9 @@ public class DrugBillNeoDTO {
     // 临床表现
     private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
 
+    // 体征
+    private List<NodeNeoDTO> vitals = new ArrayList<>();
+
     // 禁忌手术
     private List<NodeNeoDTO> operations = new ArrayList<>();
 

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

@@ -22,6 +22,9 @@ public class LisBillNeoDTO {
     // 临床表现
     private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
 
+    // 体征
+    private List<NodeNeoDTO> vitals = new ArrayList<>();
+
     // 服用药品
     private List<NodeNeoDTO> oralmeds = new ArrayList<>();
 

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

@@ -21,6 +21,9 @@ public class PacsBillNeoDTO {
     // 临床表现
     private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
 
+    // 体征
+    private List<NodeNeoDTO> vitals = new ArrayList<>();
+
     // 禁忌服用药品
     private List<NodeNeoDTO> oralmeds = new ArrayList<>();
 

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

@@ -38,6 +38,9 @@ public class LIS extends BaseNode  {
     @Relationship(type="实验室检查禁忌临床表现", direction = Relationship.OUTGOING)
     private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
 
+    @Relationship(type="实验室检查禁忌体征", direction = Relationship.OUTGOING)
+    private Set<Vital> vitals = new HashSet<>();
+
     @Relationship(type="实验室检查禁忌服用药品", direction = Relationship.OUTGOING)
     private Set<Medicine> conflict_medicines = new HashSet<>();
 
@@ -70,6 +73,9 @@ public class LIS extends BaseNode  {
 
     @Relationship(type="辅助检查禁忌实验室检查", direction = Relationship.INCOMING)
     private Set<PACS> pacs_conflict_lis;
+
+    @Relationship(type="医保ICD-10疾病相关实验室检查", direction = Relationship.INCOMING)
+    private Set<Disease> icddis_related_lis = new HashSet<>();
 }
 
 

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

@@ -59,13 +59,17 @@ public class LISPack extends BaseNode  {
     private Set<Disease> disease_related_inspect;
 
     @Relationship(type="疾病相关实验室检查套餐", direction = Relationship.INCOMING)
-    private Set<Disease> disease_related_lis;
+    private Set<Disease> disease_related_lispack;
 
     @Relationship(type="药品通用名禁忌实验室检查套餐", direction = Relationship.INCOMING)
-    private Set<Medicine> medicine_conflict_lis;
+    private Set<Medicine> medicine_conflict_lispack;
 
     @Relationship(type="辅助检查禁忌实验室检查套餐", direction = Relationship.INCOMING)
-    private Set<PACS> pacs_conflict_lis;
+    private Set<PACS> pacs_conflict_lispack;
+
+    @Relationship(type="医保ICD-10疾病相关实验室检查套餐", direction = Relationship.INCOMING)
+    private Set<Disease> icddis_related_lispack = new HashSet<>();
+
 }
 
 

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

@@ -27,6 +27,9 @@ public class Medicine extends BaseNode implements Serializable {
     @Relationship(type = "药品通用名禁忌临床表现", direction = Relationship.OUTGOING)
     private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
 
+    @Relationship(type = "药品通用名禁忌体征", direction = Relationship.OUTGOING)
+    private Set<Vital> vitals = new HashSet<>();
+
     @Relationship(type = "药品通用名禁忌实验室检查", direction = Relationship.OUTGOING)
     private Set<LIS> lisset = new HashSet<>();
 

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

@@ -38,6 +38,9 @@ public class PACS extends BaseNode  {
     @Relationship(type="辅助检查禁忌临床表现", direction = Relationship.OUTGOING)
     private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
 
+    @Relationship(type="辅助检查禁忌体征", direction = Relationship.OUTGOING)
+    private Set<Vital> vitals = new HashSet<>();
+
     @Relationship(type="辅助检查禁忌服用药品", direction = Relationship.OUTGOING)
     private Set<Medicine> conflict_medicines = new HashSet<>();
 
@@ -67,6 +70,9 @@ public class PACS extends BaseNode  {
 
     @Relationship(type="实验室检查禁忌辅助检查", direction = Relationship.INCOMING)
     private Set<LIS> lis_conflict_pacs;
+
+    @Relationship(type="医保ICD-10疾病相关辅助检查", direction = Relationship.INCOMING)
+    private Set<Disease> icddis_related_pacs = new HashSet<>();
 }
 
 

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

@@ -4,8 +4,10 @@ import com.diagbot.entity.node.base.BaseNode;
 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;
 import java.util.Set;
 
 @Setter
@@ -14,6 +16,25 @@ import java.util.Set;
 @NodeEntity(label = "体征")
 public class Vital extends BaseNode  {
 
+    @Property(name = "最大值")
+    private String maxval;
+
+    @Property(name = "最小值")
+    private String minval;
+
+    @Property(name = "单位")
+    private String unit;
+
     @Relationship(type="疾病相关体征", direction = Relationship.INCOMING)
     private Set<Disease> diseases;
+
+    @Relationship(type="实验室检查禁忌体征", direction = Relationship.INCOMING)
+    private Set<LIS> conflict_lis = new HashSet<>();
+
+    @Relationship(type="辅助检查禁忌体征", direction = Relationship.INCOMING)
+    private Set<PACS> conflict_pacs = new HashSet<>();
+
+    @Relationship(type = "药品通用名禁忌体征", direction = Relationship.INCOMING)
+    private Set<Medicine> conflict_mediciness = new HashSet<>();
+
 }

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

@@ -42,6 +42,15 @@ public class LISNode {
 			lisBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(name, min, max, unit));
 		}
 
+		Set<Vital> vitals = lis.getVitals();
+		for (Vital vital : vitals) {
+			String name = vital.getName();
+			String min = vital.getMinval();
+			String max = vital.getMaxval();
+			String unit = vital.getUnit();
+			lisBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
+		}
+
 		Set<Medicine> conflict_medicines = lis.getConflict_medicines();
 		for (Medicine conflict_medicine : conflict_medicines) {
 			String name = conflict_medicine.getName();

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

@@ -43,6 +43,16 @@ public class MedicineNode {
         }
 
 
+        Set<Vital> vitals = medicine.getVitals();
+        for (Vital vital : vitals) {
+            String name = vital.getName();
+            String min = vital.getMinval();
+            String max = vital.getMaxval();
+            String unit = vital.getUnit();
+            drugBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
+        }
+
+
         Set<LIS> lisset = medicine.getLisset();
         for (LIS lis : lisset) {
             String name = lis.getName();

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

@@ -41,6 +41,17 @@ public class PACSNode {
             pacsBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }
 
+
+        Set<Vital> vitals = pacs.getVitals();
+        for (Vital vital : vitals) {
+            String name = vital.getName();
+            String min = vital.getMinval();
+            String max = vital.getMaxval();
+            String unit = vital.getUnit();
+            pacsBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
+        }
+
+
         Set<Medicine> conflict_medicines = pacs.getConflict_medicines();
         for (Medicine conflict_medicine : conflict_medicines) {
             String name = conflict_medicine.getName();