From 8aae8dad9cb60257efc2bba55481541078008798 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 08 五月 2025 17:43:46 +0800
Subject: [PATCH] 该科室下无项目增加日志打印
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 57 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 23 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..fae6edb 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;
@@ -153,20 +155,19 @@
if (!"".equals(cusIdcard) && cusIdcard != null) {
String sfjysfzh = sysConfigService.selectConfigByKey("sfjysfzh");
-// String sfjysjh = configService.selectConfigByKey("sfjysjh");
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
if(sfjysfzh.equalsIgnoreCase("Y")){
if(cusIdcard.length()==18){
- if (! MatchUtils.isIdCard(cusIdcard)) {
+ if (!MatchUtils.isIdCard(cusIdcard)) {
return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
}
}
- if(cusIdcard.length()==9){
- if (!MatchUtils.cardValidates(cusIdcard)) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if(cusIdcard.length()==9){
+// if (!MatchUtils.cardValidates(cusIdcard)) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
}
@@ -244,7 +245,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 +279,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 +523,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("韬唤璇佸彿涓嶆纭�");
}
@@ -567,11 +568,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());
@@ -645,16 +654,16 @@
//鍒ゆ柇韬唤璇佸彿鏍煎紡鏄惁姝ｇ‘
if(sfjysfzh.equalsIgnoreCase("Y")){
- if(tjCustomer.getCusIdcard().length()==18){
+ if(customer.getIdType().equals("1")){
if (!(MatchUtils.isIdCard(tjCustomer.getCusIdcard())))
return AjaxResult.error("韬唤璇佸彿閿欒");
}
- if(tjCustomer.getCusIdcard().length()==9){
- if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) {
- return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
- }
- }
+// if(tjCustomer.getCusIdcard().length()==9){
+// if (!MatchUtils.cardValidates(tjCustomer.getCusIdcard())) {
+// return AjaxResult.error("韬唤璇佸彿鐮侀敊璇�");
+// }
+// }
}
@@ -666,7 +675,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 +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());
@@ -711,11 +720,13 @@
return AjaxResult.success();
}
}
- return AjaxResult.error();
+ return AjaxResult.success();
} catch (Exception e) {
log.error(e.toString());
throw new RuntimeException(e);
+
}
+
}
/**
--
Gitblit v1.8.0