|
@@ -6,8 +6,10 @@ import com.diagbot.dto.NeoEntityDTO;
|
|
|
import com.diagbot.entity.node.Gender;
|
|
|
import com.diagbot.entity.node.Group;
|
|
|
import com.diagbot.entity.node.LisSet;
|
|
|
+import com.diagbot.entity.node.OralMedicine;
|
|
|
import com.diagbot.entity.relationship.LisSetGender;
|
|
|
import com.diagbot.entity.relationship.LisSetGroup;
|
|
|
+import com.diagbot.entity.relationship.LisSetOralMedicine;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.NeoUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -46,6 +48,19 @@ public class LisSetNode {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ Set<LisSetOralMedicine> lisSetOralMeds = lisset.getLisSetOralMedicines();
|
|
|
+ for (LisSetOralMedicine lisSetOralMed : lisSetOralMeds) {
|
|
|
+ if (NeoUtil.isExist(lisSetOralMed)) {
|
|
|
+ if (NeoUtil.isExist(lisSetOralMed.getOralMedicine())) {
|
|
|
+ OralMedicine conflict_oralmed = lisSetOralMed.getOralMedicine();
|
|
|
+ nodeInfo = new NodeInfo();
|
|
|
+ nodeInfo.setName(conflict_oralmed.getName());
|
|
|
+ nodeInfo.setTypeval(Constants.yaoping);
|
|
|
+ lisBillNeoDTO.getOralmeds().add(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
Age age = lispack.getAge();
|
|
|
if (null!=age) {
|