From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期五, 21 二月 2025 17:49:03 +0800 Subject: [PATCH] zjh20250221 --- ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java index a57c3a0..803af65 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java @@ -1330,12 +1330,25 @@ dto1.setSqysbm(ysbm); dto1.setMzksbm(dept); dto1.setSjrq(date); - dto1.setCzybm(ysbm); - dto1.setCzyksbm(dept); - dto1.setCflxbm("A"); - dto1.setYfbm("1"); + String yfbm = configService.selectConfigByKey("chufang_yfbm"); + String mzzd = configService.selectConfigByKey("chufang_mzzd"); + String czybm = configService.selectConfigByKey("chufang_czybm"); + String czyksbm = configService.selectConfigByKey("chufang_czyksbm"); + String cflxbm = configService.selectConfigByKey("chufang_cflxbm"); + if (czybm.equalsIgnoreCase("N")) + dto1.setCzybm(ysbm); + else dto1.setCzybm(czybm); + if (czyksbm.equalsIgnoreCase("N")) + dto1.setCzyksbm(dept); + else dto1.setCzyksbm(czyksbm); + dto1.setCflxbm(cflxbm); + if (yfbm.equalsIgnoreCase("N")) + dto1.setYfbm("1"); + else dto1.setYfbm(yfbm); dto1.setFyts("1"); - dto1.setMzzd(""); + if (mzzd.equalsIgnoreCase("N")) + dto1.setMzzd(""); + else dto1.setMzzd(mzzd); dto1.setDetails(outpinmedicapplyDetilsDtos); AjaxResult result = controller.Outpinmedicapply(dto1); String result1 = getAjaxResult(result); @@ -1414,7 +1427,7 @@ if (samplings.size() >= 2) { // 杩涜鍚堝苟 List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList()); - log.info("鎻愬彇id ->{}",stringList); +// log.info("鎻愬彇id ->{}",stringList); for (int i = 0; i < stringList.size(); i++) { String s = stringList.get(i); if (tjSamplingService.isMergeItem(s) != 0) { -- Gitblit v1.8.0