@@ -36,6 +36,9 @@ public class OperationBillNeoDTO {
// 禁忌过敏药品
private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
+ // 禁忌服用药品
+ private List<NodeNeoDTO> oralmeds = new ArrayList<>();
+
// 禁忌疾病
private List<NodeNeoDTO> disease = new ArrayList<>();
@@ -45,7 +45,7 @@ public class PACS extends BaseNode {
private Set<Vital> vitals = new HashSet<>();
@Relationship(type="辅助检查禁忌服用药品", direction = Relationship.OUTGOING)
- private Set<OralMedicine> conflict_medicines = new HashSet<>();
+ private Set<OralMedicine> oralmeds = new HashSet<>();
@Relationship(type="辅助检查禁忌过敏药品", direction = Relationship.OUTGOING)
private Set<AllergicMed> allergicmeds = new HashSet<>();
@@ -59,7 +59,7 @@ public class OperationNode {
Set<OralMedicine> conflict_oralmeds = operation.getOralMedicines();
for (OralMedicine conflict_oralmed : conflict_oralmeds) {
String name = conflict_oralmed.getName();
- opBillNeoDTO.getConflictmeds().add(NeoUtil.updateNodeInfo(name, null, null, null, null));
+ opBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(name, null, null, null, null));
}
Set<Disease> conflict_disease = operation.getConflict_diseases();
@@ -57,7 +57,7 @@ public class PACSNode {
- Set<OralMedicine> conflict_medicines = pacs.getConflict_medicines();
+ Set<OralMedicine> conflict_medicines = pacs.getOralmeds();
for (OralMedicine conflict_medicine : conflict_medicines) {
String name = conflict_medicine.getName();
pacsBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(name, null, null, null, null));