|
@@ -181,20 +181,8 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (MapUtils.isNotEmpty(rulePacsCompiles)) {
|
|
|
- rulePacsCompiles.forEach((x, y) -> {
|
|
|
- String[] nameValue = x.split("_");
|
|
|
- PacsNum pacsNum = new PacsNum();
|
|
|
- pacsNum.setName(nameValue[0]);
|
|
|
- pacsNum.setStandName(nameValue[0]);
|
|
|
- PD pdnew = new PD();
|
|
|
- pdnew.setValue(nameValue[1]);
|
|
|
- pdnew.setUnit(y);
|
|
|
- pacsNum.setPd(pdnew);
|
|
|
- pacsNumList.add(pacsNum);
|
|
|
- });
|
|
|
- }
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ if (MapUtils.isNotEmpty(rulePacsCompiles)) {
|
|
|
rulePacsCompiles.forEach((x, y) -> {
|
|
|
String[] nameValue = x.split("_");
|
|
|
PacsNum pacsNum = new PacsNum();
|
|
@@ -232,21 +220,8 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (MapUtils.isNotEmpty(rulevitalsCompiles)) {
|
|
|
- rulevitalsCompiles.forEach((x, y) -> {
|
|
|
- String[] nameValue = x.split("_");
|
|
|
- Vital pacsNum = new Vital();
|
|
|
- pacsNum.setName(nameValue[0]);
|
|
|
- pacsNum.setStandName(nameValue[0]);
|
|
|
- PD pdnew = new PD();
|
|
|
- pdnew.setValue(nameValue[1]);
|
|
|
- pdnew.setUnit(y);
|
|
|
- pacsNum.setPd(pdnew);
|
|
|
- vitals.add(pacsNum);
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- } else {
|
|
|
+ }
|
|
|
+ if (MapUtils.isNotEmpty(rulevitalsCompiles)) {
|
|
|
rulevitalsCompiles.forEach((x, y) -> {
|
|
|
String[] nameValue = x.split("_");
|
|
|
Vital pacsNum = new Vital();
|