|
@@ -23,13 +23,23 @@ public class MedicineNode {
|
|
|
|
|
|
public DrugBillNeoDTO MedicinetoDrugDTO(Medicine medicine) {
|
|
|
DrugBillNeoDTO drugBillNeoDTO = new DrugBillNeoDTO();
|
|
|
+ NodeInfo nodeInfo;
|
|
|
|
|
|
Set<MedicineVital> vitals = medicine.getMedicineVital();
|
|
|
- for (MedicineVital vital : vitals) {
|
|
|
- if (NeoUtil.isExist(vital)) {
|
|
|
- if (NeoUtil.isExist(vital.getVital())) {
|
|
|
- NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(vital.getVital());
|
|
|
- drugBillNeoDTO.setAgeNeoDTO(nodeNeoDTO);
|
|
|
+ for (MedicineVital medvital : vitals) {
|
|
|
+ if (NeoUtil.isExist(medvital)) {
|
|
|
+ if (NeoUtil.isExist(medvital.getVital())) {
|
|
|
+ nodeInfo = new NodeInfo();
|
|
|
+ Vital vital = medvital.getVital();
|
|
|
+ String name = (vital.getVitalidx()==null)?vital.getName():vital.getVitalidx();
|
|
|
+ nodeInfo.setName(name);
|
|
|
+ nodeInfo.setMinval(NeoUtil.DoubletoBigDecimal(vital.getMinval()));
|
|
|
+ nodeInfo.setMaxval(NeoUtil.DoubletoBigDecimal(vital.getMaxval()));
|
|
|
+ nodeInfo.setUnit(vital.getUnit());
|
|
|
+ nodeInfo.setRange(vital.getRange());
|
|
|
+ nodeInfo.setTypeval(name);
|
|
|
+// NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(vital.getVital());
|
|
|
+ drugBillNeoDTO.setAgeNeoDTO(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
}
|
|
|
}
|