From e191ab24286eb091db9966c9227c68d1af717b46 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 20 三月 2025 11:29:35 +0800
Subject: [PATCH] zjh20250320
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/WsImportResultGroup.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java | 19 +++++++++++--------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 8 ++++++--
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index d4a70a5..6e960a7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -411,6 +411,7 @@
int woManCount = 0;//濂崇粍浜烘暟
List<String> ids=new ArrayList<>();
+ String errMsg="";
for (TjReservation tjReservation : tjReservations) {
String idCard = tjReservation.getIdCard();
String phoe = tjReservation.getPhoe();
@@ -431,6 +432,7 @@
if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) ||
(sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) {
wrongList.add(tjReservation.getName());
+ errMsg="韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�";
log.info(tjReservation.getName()+idCard+MatchUtils.isIdCard(idCard)+MatchUtils.isMobileNO(phoe));
}else {
@@ -446,7 +448,7 @@
return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
}
- TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm()));
+ TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm().trim()));
if (null != dwDept) {
for (TjDwGrouping groupingMan : groupingMans) {
if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
@@ -503,6 +505,7 @@
rightList.add(tjReservation);
} else {
wrongList.add(tjReservation.getName());
+ errMsg="鎵�閫夐」鐩悕 涓嶆纭�";
}
}
// }
@@ -578,6 +581,7 @@
} else {
wrongList.add(tjReservation.getName());
+ errMsg="韬唤璇佸彿/鎵嬫満鍙�/椤圭洰鍚嶄负绌�";
}
}
if (!yyList.isEmpty()) {
@@ -589,7 +593,7 @@
if (!wrongList.isEmpty()) {
map.put("list", wrongList);
map.put("hjMoney", hjMoney);
- return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!", map);
+ return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!"+errMsg, map);
} else {
map.put("list", rightList);
map.put("count", count);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
index a790422..78d6b3e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -81,14 +81,17 @@
for (Map.Entry<String, List<TjXdPicture>> entry : stringListMap.entrySet()) {
Map<String,Object>map=new HashMap<>();
TjCustomer customer = customerService.getById(entry.getKey());
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
- customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- customer.setTjNumber(entry.getValue().get(0).getTjNum());
- map.put("list",entry.getValue());
- map.put("customer",customer);
- map.put("picturePath",configService.selectConfigByKey("TjXdPicture"));
- arrayList.add(map);
+ if(null !=customer){
+ customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(entry.getValue().get(0).getTjNum());
+ map.put("list",entry.getValue());
+ map.put("customer",customer);
+ map.put("picturePath",configService.selectConfigByKey("TjXdPicture"));
+ arrayList.add(map);
+ }
+
}
}
List<Map<String, Object>> collect =null;
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/WsImportResultGroup.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/WsImportResultGroup.java
index 1462644..2df92a8 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/WsImportResultGroup.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/WsImportResultGroup.java
@@ -35,7 +35,7 @@
private String refRange;
- private String final;
+ private String finala;
private String finalLongText;
--
Gitblit v1.8.0