From 263413a9ade62a8501acbbc60157d48ca51a9f9d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 26 二月 2025 18:08:56 +0800
Subject: [PATCH] zjh20250226
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 20 ++++++++++----------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 2 +-
2 files changed, 11 insertions(+), 11 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 950f410..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
@@ -681,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();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 833b9bf..6b38df4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1212,16 +1212,16 @@
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
if (null != config && config.equals("Y")) {
-// AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
-// if (!result.get("code").toString().equals("200")) {
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-// Object jzh = result.get("jzh");
-// if (null != jzh && null != jzh.toString()) {
-// hisApiMethod.ZfHisApiMethod(jzh.toString());
-// }
-// log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
-// return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
-// }
+ AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
+ if (!result.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ Object jzh = result.get("jzh");
+ if (null != jzh && null != jzh.toString()) {
+ hisApiMethod.ZfHisApiMethod(jzh.toString());
+ }
+ log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
+ return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+ }
log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
//鍥綋
--
Gitblit v1.8.0