From 46444efb4a1995b31aa0196ce193887a400198ce Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 26 三月 2025 10:50:49 +0800
Subject: [PATCH] zjh20250326

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 86c1650..9cb93e1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -46,6 +46,8 @@
 import com.ltkj.common.utils.poi.ExcelUtil;
 import com.ltkj.common.core.page.TableDataInfo;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -244,7 +246,7 @@
                     tjCustomer1.setCusName(tjReservation.getName());
                     tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
                     try {
-                        tjCustomer1.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+                        tjCustomer1.setCusBrithday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()));
                     } catch (Exception e) {
                         return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
                     }
@@ -278,7 +280,7 @@
                     tjCustomer.setCusName(tjReservation.getName());
                     tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
                     try {
-                        tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+                        tjCustomer.setCusBrithday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()));
                     } catch (Exception e) {
                         return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
                     }
@@ -522,7 +524,7 @@
         tjCustomer.setCusPassword(substring);
         if(cusIdcard.length()==18) {
             try {
-                tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+                tjCustomer.setCusBrithday(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()));
             } catch (Exception e) {
                 return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
             }
@@ -666,7 +668,7 @@
 
             tjCustomer.setCusPhone(cusPhone);
             tjCustomer.setPym(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),""));
-            tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+            tjCustomer.setCusBrithday(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()));
             if (tjCustomerService.updateById(tjCustomer)) {
                 String config = sysConfigService.selectConfigByKey("sfkqdyhis");
                 if (null != config && config.equals("Y")) {
@@ -684,8 +686,8 @@
                         String apiUrl = sysConfigService.selectConfigByKey("common_api_url");
                         String hospbm = sysConfigService.selectConfigByKey("common_api_service_hospbm");
                         HashMap<String, Object> map = new HashMap<>();
-                        map.put("pationId",tjCustomer.getPationId());
-                        map.put("cardId",tjCustomer.getCardId());
+                        map.put("pationId",customer.getPationId());
+                        map.put("cardId",customer.getHisJzkh());
                         map.put("cusName",tjCustomer.getCusName());
                         map.put("cusSex",tjCustomer.getCusSex());
                         map.put("cusIdCard",tjCustomer.getCusIdcard());

--
Gitblit v1.8.0