From f2202dcded10fe1cc340d944a75a8f2473e56628 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 23 四月 2025 16:17:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/resources/application-win-chkwyytest.yaml | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
index 555bbb2..28a48a6 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
@@ -188,7 +188,7 @@
jsonObject.putOpt("name", tjCustomer.getCusName());
array.add(jsonObject);
savePacsApply.setCheckItemID(project.getHisXmbm());
- savePacsApply.setCheckItem(project.getHisXmmc());
+ savePacsApply.setCheckItem(project.getProName());
// TODO 妫�鏌ラ儴浣�
savePacsApply.setCheckPosition("-");
savePacsApply.setAmount(project.getProPrice());
diff --git a/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml b/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
index 9c2aa97..eefe7e4 100644
--- a/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
+++ b/ltkj-admin/src/main/resources/application-win-chkwyytest.yaml
@@ -251,5 +251,5 @@
# username = root
# password = Root_ltkj123
config:
- properties: C:\ltkjprojectconf\chkwyy-config.properties
+ properties: C:\ltkjprojectconf\chkwyy-config-test.properties
path: C:\ltkjprojectconf
--
Gitblit v1.8.0