|
@@ -467,7 +467,6 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
dao.deleteOrderNo(param.getActOrderNo(), param.getInpatientNo(), param.getAdmissTimes());
|
|
|
dao.insertEntryOrder(huanZheXinXi, param.getData(), userCode);
|
|
|
- // 01724
|
|
|
if (!errorMessageMap.isEmpty()) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
errorMessageMap.put("data", data);
|
|
@@ -1002,7 +1001,6 @@ public class YiZhuLuRuServer {
|
|
|
if (dao.dischargeWithMedicationAdministration(item.getSupplyCode()) == 0) {
|
|
|
errorMessage.add("出院带药给药方式不能包含费用。");
|
|
|
}
|
|
|
-
|
|
|
int day = 1;
|
|
|
if (item.getStartTime() == null) {
|
|
|
errorMessage.add("出院带药请输入开始时间。");
|
|
@@ -1022,13 +1020,13 @@ public class YiZhuLuRuServer {
|
|
|
}
|
|
|
BigDecimal total = getTotal(item, day);
|
|
|
if (StringUtil.notBlank(detailsOfDrugs.getDrugWeightUnit()) && item.getDoseUnit().trim().equals(detailsOfDrugs.getDrugWeightUnit().trim())) {
|
|
|
- item.setDrugQuan(DecimalUtil.multiply(item.getDose(), total).divide(detailsOfDrugs.getDrugWeight(), 0, RoundingMode.UP));
|
|
|
+ item.setDrugQuan(item.getDose().divide(detailsOfDrugs.getDrugWeight(), RoundingMode.UP).multiply(total));
|
|
|
item.setDrugOcc(item.getDrugQuan());
|
|
|
} else if (StringUtil.notBlank(detailsOfDrugs.getDrugVolUnit()) && item.getDoseUnit().trim().equals(detailsOfDrugs.getDrugVolUnit())) {
|
|
|
- item.setDrugQuan(DecimalUtil.multiply(item.getDose(), total).divide(detailsOfDrugs.getDrugVolume(), 0, RoundingMode.UP));
|
|
|
+ item.setDrugQuan(item.getDose().divide(detailsOfDrugs.getDrugVolume(), RoundingMode.UP).multiply(total));
|
|
|
item.setDrugOcc(item.getDrugQuan());
|
|
|
} else if (StringUtil.notBlank(detailsOfDrugs.getPackUnit()) && item.getDoseUnit().trim().equals(detailsOfDrugs.getPackUnit())) {
|
|
|
- item.setDrugQuan(DecimalUtil.multiply(item.getDose(), total).divide(detailsOfDrugs.getPackSize(), 0, RoundingMode.UP));
|
|
|
+ item.setDrugQuan(item.getDose().divide(detailsOfDrugs.getPackSize(), RoundingMode.UP).multiply(total));
|
|
|
item.setDrugOcc(item.getDrugQuan());
|
|
|
}
|
|
|
if (item.getDrugQuan().equals(BigDecimal.ZERO)) {
|