From a2d12d52275c9fc34277d3e41c662a5ea9fb597f Mon Sep 17 00:00:00 2001 From: lige <bestlige@outlook.com> Date: 星期三, 24 一月 2024 10:11:44 +0800 Subject: [PATCH] 报告合并判断心电图和附件 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java index 8de8799..ae5a863 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java @@ -560,8 +560,10 @@ project.getProId()); String s = tjFlowingWaterService.getDiscount(OrderId); if(null !=decimal){ - project.setProPrice(decimal.setScale(2)); - project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2)); +// project.setProPrice(decimal.setScale(2)); + project.setProPrice(decimal); +// project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2)); + project.setProOrdPrice(decimal); }else { BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId()); if(null !=decimal1){ -- Gitblit v1.8.0