From 57c0be167c21c6841e18d7c6e78a5fae678e8dd1 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期五, 06 六月 2025 16:19:02 +0800 Subject: [PATCH] 增加传递价格规则 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 61 ++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 5 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 c49298d..a4f5683 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 @@ -1,6 +1,7 @@ package com.ltkj.web.controller.system; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; @@ -36,6 +37,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import jodd.util.StringUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; @@ -54,6 +56,7 @@ * @author ltkj * @date 2022-11-25 */ +@Slf4j @RestController @RequestMapping("/hosp/water") @Api(tags = "浣撴娴佹按鎺ュ彛") @@ -307,6 +310,18 @@ return AjaxResult.error("琛ュ綍澶辫触,鎵�閫夐」鐩彲鑳藉凡瀛樺湪 涓嶅彲琛ュ綍!"); } + BigDecimal zongjia = new BigDecimal("0.0"); + // his鐩存帴鍗曞紑浣撴璐瑰崟椤圭洰鎬讳环缂栫爜 + String tjfhisxmbm = configService.selectConfigByKey("tjfhisxmbm"); + // 鏄惁寮�鍚痟is鐩存帴鍗曞紑浣撴璐瑰崟椤圭洰 N浣跨敤鏄庣粏寮�鍗� 鍏朵粬閮戒负鍗曢」鐩紑鎬讳环 + String lycdzjhmxj = configService.selectConfigByKey("lycdzjhmxj"); + // 鏄惁浣跨敤his浠锋牸浼犻�掕鍒� Y寮�鍚� + String sfsyhisjgrule = configService.selectConfigByKey("sfsyhisjgrule"); + // his浠锋牸浼犻�掕鍒欎繚鐣欏緱浣嶆暟 榛樿2浣� + String sfsyhisjgrulebaoliuweishu = configService.selectConfigByKey("sfsyhisjgrulebaoliuweishu"); + // his浠锋牸浼犻�掕鍒� 1鍥涜垗浜斿叆 2鐩存帴鑸嶅幓 + String sfsyhisjgrulesconfig = configService.selectConfigByKey("sfsyhisjgrulesconfig"); + for (TbTransition transition : list) { LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(TjProject::getProId, transition.getProId()); @@ -320,6 +335,26 @@ BigDecimal danjia = transition.getNowPrice(); Integer sl = project.getSl(); BigDecimal allPrice = danjia.multiply(new BigDecimal(sl)); + + if (StrUtil.isNotBlank(sfsyhisjgrule) && sfsyhisjgrule.equalsIgnoreCase("Y")){ + int baoliuweishu = 2; + if (StrUtil.isNotBlank(sfsyhisjgrulebaoliuweishu)){ + try { + baoliuweishu = Integer.parseInt(sfsyhisjgrulebaoliuweishu); + } catch (NumberFormatException e) { + log.error("his浠锋牸浼犻�掕鍒欎繚鐣欎綅鏁拌浆鎹㈠紓甯� 閰嶇疆鍊�->{}\n{}{}",sfsyhisjgrulebaoliuweishu,e,e.getMessage()); + return AjaxResult.error(); + } + } + if (StrUtil.isNotBlank(sfsyhisjgrulesconfig) && !sfsyhisjgrulesconfig.equalsIgnoreCase("1")){ + // 鍏朵粬鑷畾涔夌殑瑙勫垯璁$畻鏂规硶 + }else { + // 鍥涜垗浜斿叆 + danjia = danjia.setScale(baoliuweishu, RoundingMode.HALF_UP); + allPrice = danjia.multiply(new BigDecimal(sl)).setScale(baoliuweishu, RoundingMode.HALF_UP); + } + } + obj.putOpt("danJia", danjia); obj.putOpt("jieSuanJe", allPrice); obj.putOpt("shuliang", sl); @@ -328,13 +363,29 @@ obj.putOpt("shouFeiXmId", project.getHisXmbm()); obj.putOpt("shouFeiXmMc", project.getHisXmmc()); -// obj.putOpt("zhiXingKs","7805"); -// obj.putOpt("zhiXingKsMc","浣撴绉�"); -// obj.putOpt("shouFeiXmId","4735346"); -// obj.putOpt("shouFeiXmMc","浣撴璐�"); array.add(obj); + zongjia = zongjia.add(allPrice); } - map.put("feiYongInfoList", array); + + if(StringUtil.isNotBlank(lycdzjhmxj) && lycdzjhmxj.equalsIgnoreCase("N")){ + map.put("feiYongInfoList", array); + }else { + zongjia = tjFlowingWater.getPaidIn(); + JSONArray zjarray = JSONUtil.createArray(); + JSONObject obj = JSONUtil.createObj(); + int sl = 1; + obj.putOpt("danJia", zongjia); + obj.putOpt("jieSuanJe", zongjia); + obj.putOpt("shuliang", sl); + obj.putOpt("zhiXingKs", "100"); + obj.putOpt("zhiXingKsMc","浣撴涓績"); + obj.putOpt("shouFeiXmId", tjfhisxmbm); + obj.putOpt("shouFeiXmMc", "浣撴璐�"); + zjarray.add(obj); + map.put("feiYongInfoList", zjarray); + } + + log.info("琛ュ綍璋冪敤His鎺ュ彛鍓� 鏀惰垂鎬讳环:{}", zongjia.toString()); String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map); JSONObject object = JSONUtil.parseObj(post); -- Gitblit v1.8.0