|
@@ -231,9 +231,6 @@ public class YiZhuLuRuServer {
|
|
|
if (parent.getEndTime() != null && !parent.getEndTime().equals(children.getEndTime())) {
|
|
|
return true;
|
|
|
}
|
|
|
- if (!"044".equals(children.getSupplyCode())) {
|
|
|
- return true;
|
|
|
- }
|
|
|
if (!parent.getFrequCode().equals(children.getFrequCode())) {
|
|
|
return true;
|
|
|
}
|
|
@@ -304,7 +301,6 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
confirmOrderInformation.add(item.getActOrderNo());
|
|
|
Map<String, Object> errorMessageMap = checkData(item, drug, project, patInfo, doctorLevel);
|
|
|
-
|
|
|
if (!errorMessageMap.isEmpty()) {
|
|
|
if (!isThereAnyErrorMessage && errorMessageMap.containsKey("error")) {
|
|
|
isThereAnyErrorMessage = true;
|
|
@@ -325,6 +321,7 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
dao.stopOrder(param.getInpatientNo(), param.getAdmissTimes(), excludeOrders, userCode, orderNo);
|
|
|
}
|
|
|
+
|
|
|
for (BigDecimal decimal : confirmOrderInformation) {
|
|
|
dao.confirmOrders(decimal, userCode, new Date());
|
|
|
}
|
|
@@ -465,8 +462,14 @@ public class YiZhuLuRuServer {
|
|
|
kss, userCode, param.getInpatientNo(), param.getAdmissTimes());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
dao.deleteOrderNo(param.getActOrderNo(), param.getInpatientNo(), param.getAdmissTimes());
|
|
|
dao.insertEntryOrder(huanZheXinXi, param.getData(), userCode);
|
|
|
+ if (param.getData().getParentNo() == null) {
|
|
|
+ // 子医嘱跟随父医嘱
|
|
|
+ dao.howOftenTheSubPhysicianOrderIsModified(param.getData());
|
|
|
+ }
|
|
|
+
|
|
|
if (!errorMessageMap.isEmpty()) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
errorMessageMap.put("data", data);
|
|
@@ -924,7 +927,6 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
private Map<String, Object> checkData(XinZhenYzActOrder item,
|
|
|
Map<String, XinZhenYzActOrder> drug,
|
|
|
Map<String, List<XinZhenYzActOrder>> project,
|