From e1c75c0a4f85219061a661f9330fd965d51e2a1b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 17 七月 2024 18:23:50 +0800
Subject: [PATCH] zjh 2024/07/17-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 f13d349..cbdd7df 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
@@ -114,7 +114,7 @@
                 Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
                 String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
                 //淇濆瓨鎸傚彿鍏ュ弬鍑哄弬
-                resultDatasss.put("cardId", customer.getCardId());
+                resultDatasss.put("cardId",hisRegistrationId);
                 JSONObject object4 = JSONUtil.parseObj(resultDatasss);
                 LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinregapply");
@@ -123,8 +123,10 @@
 
                 //闂ㄨ瘖鍖荤敓鎺ヨ瘖
                 controller.Outpinconapply(hisRegistrationId, date, "00029");
-                customer.setCardId(hisRegistrationId);
-                customerService.updateById(customer);
+                if(null != tjOrder.getTjCategory() && !tjOrder.getTjCategory().equals("13")){
+                  customer.setCardId(hisRegistrationId);
+                  customerService.updateById(customer);
+                }
                 transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(), hisRegistrationId, tjOrder.getTjNumber());
                 tjOrder.setCardId(hisRegistrationId);
                 orderService.updateById(tjOrder);

--
Gitblit v1.8.0