Browse Source

更新图谱中的节点数据结构

MarkHuang 4 years ago
parent
commit
8d9ecd3302

+ 1 - 1
src/main/java/com/diagbot/dto/DrugBillNeoDTO.java

@@ -43,5 +43,5 @@ public class DrugBillNeoDTO {
     private List<NodeNeoDTO> group = new ArrayList<>();
 
     // 配伍禁忌
-    private List<NodeNeoDTO> prescribe = new ArrayList<>();
+    private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
 }

+ 2 - 2
src/main/java/com/diagbot/dto/LisBillNeoDTO.java

@@ -23,10 +23,10 @@ public class LisBillNeoDTO {
     private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
 
     // 服用药品
-    private List<NodeNeoDTO> prescribe = new ArrayList<>();
+    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
 
     // 禁忌过敏药品
-    private List<NodeNeoDTO> allergmeds = new ArrayList<>();
+    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
 
     // 禁忌手术
     private List<NodeNeoDTO> operations = new ArrayList<>();

+ 3 - 0
src/main/java/com/diagbot/dto/NodeNeoDTO.java

@@ -17,6 +17,9 @@ public class NodeNeoDTO {
     // 单位
     private String unit;
 
+    // 结果
+    private String val;
+
     // 名称
     private String name;
 }

+ 2 - 2
src/main/java/com/diagbot/dto/PacsBillNeoDTO.java

@@ -21,8 +21,8 @@ public class PacsBillNeoDTO {
     // 临床表现
     private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
 
-    // 服用药品
-    private List<NodeNeoDTO> prescribe = new ArrayList<>();
+    // 禁忌服用药品
+    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
 
     // 禁忌过敏药品
     private List<NodeNeoDTO> allergicmeds = new ArrayList<>();

+ 0 - 4
src/main/java/com/diagbot/repository/DiseaseNode.java

@@ -174,9 +174,5 @@ public class DiseaseNode {
 
 	}
 
-
-	
 }
 
-
-

+ 2 - 2
src/main/java/com/diagbot/repository/LISNode.java

@@ -41,13 +41,13 @@ public class LISNode {
 		Set<Medicine> conflict_medicines = lis.getConflict_medicines();
 		for (Medicine conflict_medicine : conflict_medicines) {
 			String name = conflict_medicine.getName();
-			lisBillNeoDTO.getPrescribe().add(NeoUtil.updateNodeInfo(name, null, null, null));
+			lisBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}
 
 		Set<AllergicMed> allergicmeds = lis.getAllergicmeds();
 		for (AllergicMed allergicmed : allergicmeds) {
 			String name = allergicmed.getName();
-			lisBillNeoDTO.getAllergmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
+			lisBillNeoDTO.getAllergicmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
 		}
 
 		Set<Operation> operations = lis.getOperations();

+ 1 - 1
src/main/java/com/diagbot/repository/MedicineNode.java

@@ -97,7 +97,7 @@ public class MedicineNode {
         Set<ConflictMed> conflict_medicines = medicine.getConflictmeds();
         for (ConflictMed conflict_medicine : conflict_medicines) {
             String name = conflict_medicine.getName();
-            drugBillNeoDTO.getPrescribe().add(NeoUtil.updateNodeInfo(name, null, null, null));
+            drugBillNeoDTO.getConflictmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
 
 

+ 1 - 1
src/main/java/com/diagbot/repository/PACSNode.java

@@ -40,7 +40,7 @@ public class PACSNode {
         Set<Medicine> conflict_medicines = pacs.getConflict_medicines();
         for (Medicine conflict_medicine : conflict_medicines) {
             String name = conflict_medicine.getName();
-            pacsBillNeoDTO.getPrescribe().add(NeoUtil.updateNodeInfo(name, null, null, null));
+            pacsBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(name, null, null, null));
         }
 
         Set<AllergicMed> allergicmeds = pacs.getAllergicmeds();