From 1e91dc33009cfdc951b2642877f40280b51c3089 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 28 二月 2025 15:17:01 +0800
Subject: [PATCH] zjh20250228
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 63bfd3f..33ec23a 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
@@ -200,7 +200,7 @@
}
// Map<String,Object> mapJinchuan=new HashMap<>();
- List<String> mapJinchuan=null;
+ private static List<String> mapJinchuan=null;
public AjaxResult tijianshenqingJinchuanNew(TjCustomer customer, String date,String cardId)
{
mapJinchuan=new ArrayList<>();
@@ -213,6 +213,8 @@
String dept = configService.selectConfigByKey("request_default_dept");
String ysbm = configService.selectConfigByKey("request_default_ysbm");
String ysmc = configService.selectConfigByKey("request_default_ysmc");
+
+ log.info("mapJinchuan闆嗗悎閲岄潰鐨勬暟鎹槸: "+mapJinchuan.toString());
List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
@@ -254,6 +256,8 @@
wrapper.notIn(TjProject::getProParentId, mapJinchuan);
}
List<TjProject> list = projectService.list(wrapper);
+
+ log.info("妫�楠岀敵璇烽泦鍚堥噷闈㈢殑鏁版嵁鏄�: "+list.toString());
for (TjProject tjProject : list) {
if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
@@ -677,7 +681,7 @@
if (null != project.getHisXmbm()) {
if (project.getSfzhfy().equals("Y")) {
- mapJinchuan.add(project.getProParentId().toString());
+ mapJinchuan.add(project.getProId().toString());
//TODO 杩欓噷detailsDto 鏀规垚浼犻�掓墍鏈夌殑灏忛」 妫�楠屾槸鍚堝苟涔嬪悗杩涜鍙戦�� 涓�涓牱鏈唬鐮佷竴娆¤姹�
// 鎵�鏈夌殑灏忛」鍏ㄩ儴娣诲姞鍒拌繖涓泦鍚堜箣涓�
OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
--
Gitblit v1.8.0