From aacaa3d2daafbd97ab008908b9f2fe9ed6c1f713 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 30 四月 2025 17:17:42 +0800
Subject: [PATCH] pdf生成增加失败撤回
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 242247d..85cb775 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
@@ -243,7 +243,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().replaceAll(" ", "")));
} catch (Exception e) {
return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
}
@@ -277,7 +277,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("韬唤璇佸彿涓嶆纭�");
}
@@ -521,7 +521,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("韬唤璇佸彿涓嶆纭�");
}
@@ -570,11 +570,19 @@
return tjCustomer;
}else {
HashMap<String, Object> map = new HashMap<>();
- map.put("cardId","");
+ // 1鏄韩浠借瘉
+ // 鏍规嵁鍑屼簯his鎺ュ彛鍙涓嶆槸鍥藉唴韬唤璇佸彿 韬唤璇佸瓧娈典笉浼� 灏嗗彿鐮佷紶閫掑埌鍗″彿瀛楁骞跺崟浣嶇紪鍙峰繀濉� 鍗曚綅缂栧彿闅忎究鍐�
+ if (!tjCustomer.getIdType().equals("1")){
+ map.put("cardId",tjCustomer.getCusIdcard());
+ map.put("compId",tjCustomer.getCusIdcard());
+ map.put("cusIdCard", "");
+ }else {
+ map.put("cardId","");
+ map.put("cusIdCard", tjCustomer.getCusIdcard());
+ map.put("compId","");
+ }
map.put("cusName", tjCustomer.getCusName());
map.put("cusSex", tjCustomer.getCusSex());
- map.put("cusIdCard", tjCustomer.getCusIdcard());
- map.put("compId","");
map.put("cusBrithday", tjCustomer.getCusBrithday() != null ? DateUtil.format(tjCustomer.getCusBrithday(), "yyyy-MM-dd") : "");
map.put("cusAddr", tjCustomer.getCusAddr());
map.put("cusPhone", tjCustomer.getCusPhone());
@@ -685,8 +693,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