@@ -45,7 +45,7 @@ public class PACS extends BaseNode {
private Set<Vital> vitals = new HashSet<>();
@Relationship(type="辅助检查禁忌服用药品", direction = Relationship.OUTGOING)
- private Set<Medicine> conflict_medicines = new HashSet<>();
+ private Set<OralMedicine> conflict_medicines = new HashSet<>();
@Relationship(type="辅助检查禁忌过敏药品", direction = Relationship.OUTGOING)
private Set<AllergicMed> allergicmeds = new HashSet<>();
@@ -57,8 +57,8 @@ public class PACSNode {
}
- Set<Medicine> conflict_medicines = pacs.getConflict_medicines();
- for (Medicine conflict_medicine : conflict_medicines) {
+ Set<OralMedicine> conflict_medicines = pacs.getConflict_medicines();
+ for (OralMedicine conflict_medicine : conflict_medicines) {
String name = conflict_medicine.getName();
pacsBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(name, null, null, null, null));