更新化验开单合理性的返回数据结构

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

@@ -31,7 +31,7 @@ public class DrugBillNeoDTO {
     private List<String> lis = new ArrayList<>();
 
     // 禁忌辅助检查
-    private List<String> PACS = new ArrayList<>();
+    private List<String> Pacs = new ArrayList<>();
 
     // 禁忌过敏药品
     private List<String> allergicmeds = new ArrayList<>();

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

@@ -1,7 +1,9 @@
 package com.diagbot.dto;
 
+import com.diagbot.entity.node.Age;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -14,34 +16,31 @@ public class LisBillNeoDTO {
     // 禁忌性别
     private String gender;
 
-    // 年龄最小值
-    private Integer minage;
-
-    // 年龄最大值
-    private Integer maxage;
+    // 年龄
+    private RangeNeoDTO ageNeoDTO;
 
     // 临床表现
-    private List<String> clinicfindings;
+    private List<String> clinicfindings = new ArrayList<>();
 
     // 服用药品
-    private List<String> prescribe;
+    private List<String> prescribe = new ArrayList<>();
 
     // 禁忌过敏药品
-    private List<String> allergmeds;
+    private List<String> allergmeds = new ArrayList<>();
 
     // 禁忌手术
-    private List<String> operations;
+    private List<String> operations = new ArrayList<>();
 
     // 禁忌操作
-    private List<String> procedures;
+    private List<String> procedures = new ArrayList<>();
 
     // 禁忌辅助检查
-    private List<String> pacs;
+    private List<String> Pacs = new ArrayList<>();
 
     // 禁忌疾病
-    private List<String> disease;
+    private List<String> disease = new ArrayList<>();
 
     // 禁用人群
-    private List<String> group;
+    private List<String> group = new ArrayList<>();
 
 }

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

@@ -2,6 +2,7 @@ package com.diagbot.dto;
 
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,27 +19,27 @@ public class PacsBillNeoDTO {
     private RangeNeoDTO ageNeoDTO;
 
     // 临床表现
-    private List<RangeNeoDTO> clinicfindings;
+    private List<RangeNeoDTO> clinicfindings = new ArrayList<>();
 
     // 服用药品
-    private List<String> prescribe;
+    private List<String> prescribe = new ArrayList<>();
 
     // 禁忌过敏药品
-    private List<String> allergicmeds;
+    private List<String> allergicmeds = new ArrayList<>();
 
     // 禁忌手术
-    private List<String> operations;
+    private List<String> operations = new ArrayList<>();
 
     // 禁忌操作
-    private List<String> procedures;
+    private List<String> procedures = new ArrayList<>();
 
     // 禁忌实验室检查
-    private List<String> lis;
+    private List<String> Lis = new ArrayList<>();
 
     // 禁忌疾病
-    private List<String> disease;
+    private List<String> disease = new ArrayList<>();
 
     // 禁用人群
-    private List<String> group;
+    private List<String> group = new ArrayList<>();
 
 }

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

@@ -27,4 +27,7 @@ public class Age extends BaseNode  {
     @Relationship(type="辅助检查禁忌年龄", direction = Relationship.INCOMING)
     private Set<PACS> pacs;
 
+    @Relationship(type="实验室检查禁忌年龄", direction = Relationship.INCOMING)
+    private Set<LIS> lis;
+
 }

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

@@ -23,4 +23,7 @@ public class AllergicMed extends BaseNode  {
 
     @Relationship(type="辅助检查禁忌过敏药品", direction = Relationship.INCOMING)
     private Set<PACS> pacs;
+
+    @Relationship(type="实验室检查禁忌过敏药品", direction = Relationship.INCOMING)
+    private Set<LIS> lis;
 }

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

@@ -10,6 +10,7 @@ import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 
 @Setter
@@ -32,4 +33,8 @@ public class ClinicalFinding extends BaseNode  {
 
     @Relationship(type="辅助检查禁忌临床表现", direction = Relationship.INCOMING)
     private Set<PACS> pacs;
+
+    @Relationship(type="实验室检查禁忌临床表现", direction = Relationship.INCOMING)
+    private Set<ClinicalFinding> clinicalfindings;
+
 }

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

@@ -23,4 +23,7 @@ public class Disease extends BaseNode  {
 
     @Relationship(type="辅助检查禁忌疾病", direction = Relationship.INCOMING)
     private Set<PACS> pacs;
+
+    @Relationship(type="实验室检查禁忌疾病", direction = Relationship.INCOMING)
+    private Set<Disease> diseases;
 }

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

@@ -20,4 +20,10 @@ public class Gender extends BaseNode  {
 
     @Relationship(type="药品通用名禁忌性别", direction = Relationship.INCOMING)
     private Set<Medicine> medicines;
+
+    @Relationship(type = "辅助检查禁忌性别", direction = Relationship.INCOMING)
+    private Set<PACS> pacs;
+
+    @Relationship(type="实验室检查禁忌性别", direction = Relationship.INCOMING)
+    private Set<LIS> lis;
 }

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

@@ -23,4 +23,7 @@ public class Group extends BaseNode  {
 
     @Relationship(type="辅助检查禁忌人群", direction = Relationship.INCOMING)
     private Set<PACS> pacs;
+
+    @Relationship(type="实验室检查禁忌人群", direction = Relationship.INCOMING)
+    private Set<LIS> lis;
 }

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

@@ -10,6 +10,7 @@ import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 
 @Setter
@@ -18,9 +19,42 @@ import java.util.Set;
 @NodeEntity(label = "实验室检查")
 public class LIS extends BaseNode  {
 
+    @Relationship(type="实验室检查禁忌性别", direction = Relationship.OUTGOING)
+    private Gender gender;
+
+    @Relationship(type="实验室检查禁忌年龄", direction = Relationship.OUTGOING)
+    private Age age;
+
+    @Relationship(type="实验室检查禁忌临床表现", direction = Relationship.OUTGOING)
+    private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌服用药品", direction = Relationship.OUTGOING)
+    private Set<Medicine> conflict_medicines = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌过敏药品", direction = Relationship.OUTGOING)
+    private Set<AllergicMed> allergicmeds = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌手术", direction = Relationship.OUTGOING)
+    private Set<Operation> operations = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌操作", direction = Relationship.OUTGOING)
+    private Set<Procedure> procedures = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌辅助检查", direction = Relationship.OUTGOING)
+    private Set<PACS> pacs = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌疾病", direction = Relationship.OUTGOING)
+    private Set<Disease> diseases = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌人群", direction = Relationship.OUTGOING)
+    private Set<Group> groups = new HashSet<>();
+
     @Relationship(type="药品通用名禁忌实验室检查", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
+    private Set<Medicine> in_medicine;
 
     @Relationship(type="辅助检查禁忌实验室检查", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
+    private Set<PACS> in_pacs;
 }
+
+
+

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

@@ -31,7 +31,7 @@ public class Medicine extends BaseNode implements Serializable {
     private Set<LIS> lisset = new HashSet<>();
 
     @Relationship(type = "药品通用名禁忌辅助检查", direction = Relationship.OUTGOING)
-    private Set<PACS> pacsset = new HashSet<>();
+    private Set<PACS> pacs = new HashSet<>();
 
     @Relationship(type = "药品通用名禁忌过敏药品", direction = Relationship.OUTGOING)
     private Set<AllergicMed> allergicmeds = new HashSet<>();
@@ -52,7 +52,10 @@ public class Medicine extends BaseNode implements Serializable {
     private Set<ConflictMed> conflictmeds = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌服用药品", direction = Relationship.INCOMING)
-    private Set<PACS> pacs;
+    private Set<PACS> in_pacs;
+
+    @Relationship(type="实验室检查禁忌服用药品", direction = Relationship.INCOMING)
+    private Set<Medicine> in_medicine;
 
 }
 

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

@@ -23,4 +23,7 @@ public class Operation extends BaseNode  {
 
     @Relationship(type="辅助检查禁忌手术", direction = Relationship.INCOMING)
     private Set<PACS> pacs;
+
+    @Relationship(type="实验室检查禁忌手术", direction = Relationship.INCOMING)
+    private Set<LIS> lis;
 }

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

@@ -10,6 +10,7 @@ import org.neo4j.ogm.annotation.NodeEntity;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
+import java.util.HashSet;
 import java.util.Set;
 
 @Setter
@@ -18,38 +19,41 @@ import java.util.Set;
 @NodeEntity(label = "辅助检查")
 public class PACS extends BaseNode  {
 
-    @Relationship(type = "药品通用名禁忌性别", direction = Relationship.OUTGOING)
+    @Relationship(type = "辅助检查禁忌性别", direction = Relationship.OUTGOING)
     private Gender gender;
 
     @Relationship(type="辅助检查禁忌年龄", direction = Relationship.OUTGOING)
     private Age age;
 
     @Relationship(type="辅助检查禁忌临床表现", direction = Relationship.OUTGOING)
-    private Set<ClinicalFinding> clinicalfindings;
+    private Set<ClinicalFinding> clinicalfindings = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌服用药品", direction = Relationship.OUTGOING)
-    private Set<Medicine> conflict_medicines;
+    private Set<Medicine> conflict_medicines = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌过敏药品", direction = Relationship.OUTGOING)
-    private Set<AllergicMed> allergicmeds;
+    private Set<AllergicMed> allergicmeds = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌手术", direction = Relationship.OUTGOING)
-    private Set<Operation> operations;
+    private Set<Operation> operations = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌操作", direction = Relationship.OUTGOING)
-    private Set<Procedure> procedures;
+    private Set<Procedure> procedures = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌实验室检查", direction = Relationship.OUTGOING)
-    private Set<LIS> liss;
+    private Set<LIS> liss = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌疾病", direction = Relationship.OUTGOING)
-    private Set<Disease> diseases;
+    private Set<Disease> diseases = new HashSet<>();
 
     @Relationship(type="辅助检查禁忌人群", direction = Relationship.OUTGOING)
-    private Set<Group> groups;
+    private Set<Group> groups = new HashSet<>();
 
     @Relationship(type="药品通用名禁忌辅助检查", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
+    private Set<Medicine> in_medicines = new HashSet<>();
+
+    @Relationship(type="实验室检查禁忌辅助检查", direction = Relationship.INCOMING)
+    private Set<LIS> in_lis;
 }
 
 

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

@@ -23,4 +23,8 @@ public class Procedure extends BaseNode  {
 
     @Relationship(type="辅助检查禁忌操作", direction = Relationship.INCOMING)
     private Set<PACS> pacs;
+
+    @Relationship(type="实验室检查禁忌操作", direction = Relationship.INCOMING)
+    private Set<LIS> lis;
+
 }

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

@@ -41,10 +41,10 @@ public class MedicineNode {
         }
 
 
-        Set<PACS> pacsset = medicine.getPacsset();
+        Set<PACS> pacsset = medicine.getPacs();
         for (PACS pacs : pacsset) {
             String pacs_val = (pacs == null) ? "" : pacs.getName();
-            drugBillNeoDTO.getPACS().add(pacs_val);
+            drugBillNeoDTO.getPacs().add(pacs_val);
         }
 
 

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

@@ -34,8 +34,12 @@ public class PACSNode {
 
             if (clinicalfinding.getUnit()!=null) {
                 rangeNeoDTO.setUnit(clinicalfinding.getUnit());
-//                rangeNeoDTO.setMin(BigDecimal.valueOf(clinicalfinding.getMinval()));
-//                rangeNeoDTO.setMax(BigDecimal.valueOf(clinicalfinding.getMaxval()));
+                if (null!=clinicalfinding.getMinval()) {
+                    rangeNeoDTO.setMin(new BigDecimal(clinicalfinding.getMinval()));
+                }
+                if (null!=clinicalfinding.getMaxval()) {
+                    rangeNeoDTO.setMax(new BigDecimal(clinicalfinding.getMaxval()));
+                }
             }
 
             pacsBillNeoDTO.getClinicfindings().add(rangeNeoDTO);