更新图谱查询结果的处理方法

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

@@ -20,10 +20,10 @@ public class BillNeoMaxDTO {
     private String gender;
 
     // 年龄
-    private RangeNeoDTO ageNeoDTO;
+    private NodeNeoDTO ageNeoDTO;
 
     // 临床表现
-    private List<RangeNeoDTO> clinicfindings = new ArrayList<>();
+    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
 
     // 服用药品
     private List<String> prescribe = new ArrayList<>();
@@ -38,7 +38,7 @@ public class BillNeoMaxDTO {
     private List<String> procedures = new ArrayList<>();
 
     // 禁忌辅助检查
-    private List<RangeNeoDTO> Pacs = new ArrayList<>();
+    private List<NodeNeoDTO> Pacs = new ArrayList<>();
 
     // 禁忌疾病
     private List<String> disease = new ArrayList<>();
@@ -50,7 +50,7 @@ public class BillNeoMaxDTO {
     private List<String> allergicmeds = new ArrayList<>();
 
     // 禁忌实验室检查
-    private List<RangeNeoDTO> lis = new ArrayList<>();
+    private List<NodeNeoDTO> lis = new ArrayList<>();
 
     // 配伍禁忌
     private List<String> conflictmeds = new ArrayList<>();

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

@@ -1,22 +0,0 @@
-package com.diagbot.entity.node;
-
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "年龄最大值")
-public class AgeMax extends BaseNode  {
-
-    @Relationship(type="药品通用名禁忌年龄最大值", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
-}

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

@@ -1,24 +0,0 @@
-package com.diagbot.entity.node;
-
-import com.diagbot.model.ai.model.Relation;
-import lombok.Data;
-import com.diagbot.entity.node.base.BaseNode;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.NodeEntity;
-import org.neo4j.ogm.annotation.Relationship;
-
-import java.io.Serializable;
-import java.util.Set;
-
-@Setter
-@Getter
-//@EqualsAndHashCode(callSuper = false)
-@NodeEntity(label = "年龄最小值")
-public class AgeMin extends BaseNode {
-
-    @Relationship(type="药品通用名禁忌年龄最小值", direction = Relationship.INCOMING)
-    private Set<Medicine> medicines;
-
-}

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

@@ -21,7 +21,7 @@ public class Disease extends BaseNode  {
 
     @Relationship(type="疾病相关年龄", direction = Relationship.OUTGOING)
     private Age age;
-/*
+
     @Relationship(type="疾病相关治愈率", direction = Relationship.OUTGOING)
     private Set<CureRate> curerates = new HashSet<>();
 
@@ -53,7 +53,7 @@ public class Disease extends BaseNode  {
     private Set<Code> codes = new HashSet<>();
 
     @Relationship(type="疾病相关标准科室", direction = Relationship.OUTGOING)
-    private Set<StdDept> stddepts = new HashSet<>();
+    private Set<Dept> stddepts = new HashSet<>();
 
     @Relationship(type="疾病相关性别", direction = Relationship.OUTGOING)
     private Set<Gender> genders = new HashSet<>();
@@ -69,12 +69,10 @@ public class Disease extends BaseNode  {
 
     @Relationship(type="疾病相关发病原因", direction = Relationship.OUTGOING)
     private Set<Cause> causes = new HashSet<>();
-    */
 
     @Relationship(type="疾病相关鉴别诊断", direction = Relationship.OUTGOING)
     private Set<Disease> diff_diseases = new HashSet<>();
 
-    /*
     @Relationship(type="疾病相关手术", direction = Relationship.OUTGOING)
     private Set<Operation> operations = new HashSet<>();
 
@@ -91,10 +89,10 @@ public class Disease extends BaseNode  {
     private Set<DiseaseType> diseasetypes = new HashSet<>();
 
     @Relationship(type="疾病相关局部并发症", direction = Relationship.OUTGOING)
-    private Set<LocalCompl> localcompls = new HashSet<>();
+    private Set<Complication> localcompls = new HashSet<>();
 
     @Relationship(type="疾病相关全身并发症", direction = Relationship.OUTGOING)
-    private Set<GeneralCompl> generalcompls = new HashSet<>();
+    private Set<Complication> generalcompls = new HashSet<>();
 
     @Relationship(type="疾病相关化验", direction = Relationship.OUTGOING)
     private Set<LIS> liss = new HashSet<>();
@@ -104,7 +102,7 @@ public class Disease extends BaseNode  {
 
     @Relationship(type="疾病相关药品名及编码", direction = Relationship.OUTGOING)
     private Medicine_Code medicine_code;
-*/
+
     @Relationship(type="药品通用名禁忌疾病", direction = Relationship.INCOMING)
     private Set<Medicine> medicine_diseases;
 

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

@@ -31,22 +31,6 @@ public class LISNode {
 
 		Set<ClinicalFinding> clinicalfindings = lis.getClinicalfindings();
 		for (ClinicalFinding clinicalfinding : clinicalfindings) {
-			/*
-			RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
-			String clinicalfinding_val = (clinicalfinding==null)?"":clinicalfinding.getName();
-			rangeNeoDTO.setName(clinicalfinding_val);
-
-			if (clinicalfinding.getUnit()!=null) {
-				rangeNeoDTO.setUnit(clinicalfinding.getUnit());
-				if (null!=clinicalfinding.getMinval()) {
-					rangeNeoDTO.setMin(new BigDecimal(clinicalfinding.getMinval()));
-				}
-				if (null!=clinicalfinding.getMaxval()) {
-					rangeNeoDTO.setMax(new BigDecimal(clinicalfinding.getMaxval()));
-				}
-			}
-			lisBillNeoDTO.getClinicfindings().add(rangeNeoDTO);
-			*/
 			String name = clinicalfinding.getName();
 			String min = clinicalfinding.getMinval();
 			String max = clinicalfinding.getMaxval();
@@ -56,53 +40,30 @@ public class LISNode {
 
 		Set<Medicine> conflict_medicines = lis.getConflict_medicines();
 		for (Medicine conflict_medicine : conflict_medicines) {
-//			String medicine_val = (conflict_medicine==null)?"":conflict_medicine.getName();
-//			lisBillNeoDTO.getPrescribe().add(medicine_val);
 			String name = conflict_medicine.getName();
 			lisBillNeoDTO.getPrescribe().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}
 
 		Set<AllergicMed> allergicmeds = lis.getAllergicmeds();
 		for (AllergicMed allergicmed : allergicmeds) {
-//			String allergicmed_val = (allergicmed==null)?"":allergicmed.getName();
-//			lisBillNeoDTO.getAllergmeds().add(allergicmed_val);
 			String name = allergicmed.getName();
 			lisBillNeoDTO.getAllergmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}
 
 		Set<Operation> operations = lis.getOperations();
 		for (Operation operation : operations) {
-//			String operation_val = (operation==null)?"":operation.getName();
-//			lisBillNeoDTO.getOperations().add(operation_val);
 			String name = operation.getName();
 			lisBillNeoDTO.getOperations().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}
 
 		Set<Procedure> procedures = lis.getProcedures();
 		for (Procedure procedure : procedures) {
-//			String procedure_val = (procedure==null)?"":procedure.getName();
-//			lisBillNeoDTO.getProcedures().add(procedure_val);
 			String name = procedure.getName();
 			lisBillNeoDTO.getProcedures().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}
 
 		Set<PACS> pacss = lis.getPacs();
 		for (PACS pacs : pacss) {
-//			RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
-//			String pacs_val = (pacs==null)?"":pacs.getName();
-//			rangeNeoDTO.setName(pacs_val);
-//
-//			if (pacs.getUnit()!=null) {
-//				rangeNeoDTO.setUnit(pacs.getUnit());
-//				if (null!=pacs.getMinval()) {
-//					rangeNeoDTO.setMin(new BigDecimal(pacs.getMinval()));
-//				}
-//				if (null!=pacs.getMaxval()) {
-//					rangeNeoDTO.setMax(new BigDecimal(pacs.getMaxval()));
-//				}
-//			}
-//
-//			lisBillNeoDTO.getPacs().add(rangeNeoDTO);
 			String name = pacs.getName();
 			String min = pacs.getMinval();
 			String max = pacs.getMaxval();
@@ -112,16 +73,12 @@ public class LISNode {
 
 		Set<Disease> diseases = lis.getDiseases();
 		for (Disease disease : diseases) {
-//			String disease_val = (disease==null)?"":disease.getName();
-//			lisBillNeoDTO.getDisease().add(disease_val);
 			String name = disease.getName();
 			lisBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}
 
 		Set<Group> groups = lis.getGroups();
 		for (Group group : groups) {
-//			String group_val = (group==null)?"":group.getName();
-//			lisBillNeoDTO.getGroup().add(group_val);
 			String name = group.getName();
 			lisBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}

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

@@ -31,20 +31,6 @@ public class MedicineNode {
 
         Set<ClinicalFinding> clinicalfindings = medicine.getClinicalfindings();
         for (ClinicalFinding clinicalfinding : clinicalfindings) {
-//            RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
-//            String clinicalfinding_val = (clinicalfinding==null)?"":clinicalfinding.getName();
-//            rangeNeoDTO.setName(clinicalfinding_val);
-//
-//            if (clinicalfinding.getUnit()!=null) {
-//                rangeNeoDTO.setUnit(clinicalfinding.getUnit());
-//                if (null!=clinicalfinding.getMinval()) {
-//                    rangeNeoDTO.setMin(new BigDecimal(clinicalfinding.getMinval()));
-//                }
-//                if (null!=clinicalfinding.getMaxval()) {
-//                    rangeNeoDTO.setMax(new BigDecimal(clinicalfinding.getMaxval()));
-//                }
-//            }
-//            drugBillNeoDTO.getClinicfindings().add(rangeNeoDTO);
             String name = clinicalfinding.getName();
             String min = clinicalfinding.getMinval();
             String max = clinicalfinding.getMaxval();
@@ -55,21 +41,6 @@ public class MedicineNode {
 
         Set<LIS> lisset = medicine.getLisset();
         for (LIS lis : lisset) {
-//            RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
-//            String lis_val = (lis==null)?"":lis.getName();
-//            rangeNeoDTO.setName(lis_val);
-//
-//            if (lis.getUnit()!=null) {
-//                rangeNeoDTO.setUnit(lis.getUnit());
-//                if (null!=lis.getMinval()) {
-//                    rangeNeoDTO.setMin(new BigDecimal(lis.getMinval()));
-//                }
-//                if (null!=lis.getMaxval()) {
-//                    rangeNeoDTO.setMax(new BigDecimal(lis.getMaxval()));
-//                }
-//            }
-//
-//            drugBillNeoDTO.getLis().add(rangeNeoDTO);
             String name = lis.getName();
             String min = lis.getMinval();
             String max = lis.getMaxval();
@@ -80,21 +51,6 @@ public class MedicineNode {
 
         Set<PACS> pacsset = medicine.getPacs();
         for (PACS pacs : pacsset) {
-//            RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
-//            String pacs_val = (pacs==null)?"":pacs.getName();
-//            rangeNeoDTO.setName(pacs_val);
-//
-//            if (pacs.getUnit()!=null) {
-//                rangeNeoDTO.setUnit(pacs.getUnit());
-//                if (null!=pacs.getMinval()) {
-//                    rangeNeoDTO.setMin(new BigDecimal(pacs.getMinval()));
-//                }
-//                if (null!=pacs.getMaxval()) {
-//                    rangeNeoDTO.setMax(new BigDecimal(pacs.getMaxval()));
-//                }
-//            }
-//
-//            drugBillNeoDTO.getPacs().add(rangeNeoDTO);
             String name = pacs.getName();
             String min = pacs.getMinval();
             String max = pacs.getMaxval();
@@ -105,8 +61,6 @@ public class MedicineNode {
 
         Set<AllergicMed> allergicmeds = medicine.getAllergicmeds();
         for (AllergicMed allergicmed: allergicmeds) {
-//            String allergicmed_val = (allergicmed == null) ? "" : allergicmed.getName();
-//            drugBillNeoDTO.getAllergicmeds().add(allergicmed_val);
             String name = allergicmed.getName();
             drugBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
@@ -114,8 +68,6 @@ public class MedicineNode {
 
         Set<Operation> operations = medicine.getOperations();
         for (Operation operation : operations) {
-//            String operation_val = (operation == null) ? "" : operation.getName();
-//            drugBillNeoDTO.getOperations().add(operation_val);
             String name = operation.getName();
             drugBillNeoDTO.getOperations().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
@@ -123,8 +75,6 @@ public class MedicineNode {
 
         Set<Procedure> procedures = medicine.getProcedures();
         for (Procedure procedure : procedures) {
-//            String procedure_val = (procedure == null) ? "" : procedure.getName();
-//            drugBillNeoDTO.getProcedures().add(procedure_val);
             String name = procedure.getName();
             drugBillNeoDTO.getProcedures().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
@@ -132,8 +82,6 @@ public class MedicineNode {
 
         Set<Disease> diseases = medicine.getDiseases();
         for (Disease disease : diseases) {
-//            String disease_val = (disease == null) ? "" : disease.getName();
-//            drugBillNeoDTO.getDisease().add(disease_val);
             String name = disease.getName();
             drugBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
@@ -141,8 +89,6 @@ public class MedicineNode {
 
         Set<Group> groups = medicine.getGroups();
         for (Group group : groups) {
-//            String group_val = (group == null) ? "" : group.getName();
-//            drugBillNeoDTO.getGroup().add(group_val);
             String name = group.getName();
             drugBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
@@ -150,8 +96,6 @@ public class MedicineNode {
 
         Set<ConflictMed> conflict_medicines = medicine.getConflictmeds();
         for (ConflictMed conflict_medicine : conflict_medicines) {
-//            String conflict_val = (conflictMed == null) ? "" : conflictMed.getName();
-//            drugBillNeoDTO.getConflictmeds().add(conflict_val);
             String name = conflict_medicine.getName();
             drugBillNeoDTO.getPrescribe().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }

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

@@ -30,21 +30,6 @@ public class PACSNode {
 
         Set<ClinicalFinding> clinicalfindings = pacs.getClinicalfindings();
         for (ClinicalFinding clinicalfinding : clinicalfindings) {
-//            RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
-//            String clinicalfinding_val = (clinicalfinding == null) ? "" : clinicalfinding.getName();
-//            rangeNeoDTO.setName(clinicalfinding_val);
-//
-//            if (clinicalfinding.getUnit()!=null) {
-//                rangeNeoDTO.setUnit(clinicalfinding.getUnit());
-//                if (null!=clinicalfinding.getMinval()) {
-//                    rangeNeoDTO.setMin(new BigDecimal(clinicalfinding.getMinval()));
-//                }
-//                if (null!=clinicalfinding.getMaxval()) {
-//                    rangeNeoDTO.setMax(new BigDecimal(clinicalfinding.getMaxval()));
-//                }
-//            }
-//
-//            pacsBillNeoDTO.getClinicfindings().add(rangeNeoDTO);
             String name = clinicalfinding.getName();
             String min = clinicalfinding.getMinval();
             String max = clinicalfinding.getMaxval();
@@ -54,53 +39,30 @@ public class PACSNode {
 
         Set<Medicine> conflict_medicines = pacs.getConflict_medicines();
         for (Medicine conflict_medicine : conflict_medicines) {
-//            String medicine_val = (conflict_medicine==null)?"":conflict_medicine.getName();
-//            pacsBillNeoDTO.getPrescribe().add(medicine_val);
             String name = conflict_medicine.getName();
             pacsBillNeoDTO.getPrescribe().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
 
         Set<AllergicMed> allergicmeds = pacs.getAllergicmeds();
         for (AllergicMed allergicmed : allergicmeds) {
-//            String allergicmed_val = (allergicmed==null)?"":allergicmed.getName();
-//            pacsBillNeoDTO.getAllergicmeds().add(allergicmed_val);
             String name = allergicmed.getName();
             pacsBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
 
         Set<Operation> operations = pacs.getOperations();
         for (Operation operation : operations) {
-//            String operation_val = (operation==null)?"":operation.getName();
-//            pacsBillNeoDTO.getOperations().add(operation_val);
             String name = operation.getName();
             pacsBillNeoDTO.getOperations().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
 
         Set<Procedure> procedures = pacs.getProcedures();
         for (Procedure procedure : procedures) {
-//            String procedure_val = (procedure==null)?"":procedure.getName();
-//            pacsBillNeoDTO.getProcedures().add(procedure_val);
             String name = procedure.getName();
             pacsBillNeoDTO.getProcedures().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
 
         Set<LIS> liss = pacs.getLiss();
         for (LIS lis : liss) {
-//            RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
-//            String lis_val = (lis==null)?"":lis.getName();
-//            rangeNeoDTO.setName(lis_val);
-//
-//            if (lis.getUnit()!=null) {
-//                rangeNeoDTO.setUnit(lis.getUnit());
-//                if (null!=lis.getMinval()) {
-//                    rangeNeoDTO.setMin(new BigDecimal(lis.getMinval()));
-//                }
-//                if (null!=lis.getMaxval()) {
-//                    rangeNeoDTO.setMax(new BigDecimal(lis.getMaxval()));
-//                }
-//            }
-//
-//            pacsBillNeoDTO.getLis().add(rangeNeoDTO);
             String name = lis.getName();
             String min = lis.getMinval();
             String max = lis.getMaxval();
@@ -110,16 +72,12 @@ public class PACSNode {
 
         Set<Disease> diseases = pacs.getDiseases();
         for (Disease disease : diseases) {
-//            String disease_val = (disease==null)?"":disease.getName();
-//            pacsBillNeoDTO.getDisease().add(disease_val);
             String name = disease.getName();
             pacsBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
 
         Set<Group> groups = pacs.getGroups();
         for (Group group : groups) {
-//            String group_val = (group==null)?"":group.getName();
-//            pacsBillNeoDTO.getGroup().add(group_val);
             String name = group.getName();
             pacsBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }