From b3ffebcf0f1c58ac2f33922bffc5cff330873bde Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 四月 2025 17:47:08 +0800
Subject: [PATCH] zjh20250418
---
ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java | 19 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 257 ++++++++++++++++++++-------------------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java | 2
7 files changed, 122 insertions(+), 170 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
index 997b869..a8cd91d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/CustomerController.java
@@ -147,7 +147,7 @@
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
try {
- tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(cusIdcard), "yyyy-MM-dd"));
+ tjCustomer.setCusBrithday(MatchUtils.getBirthDayByIdCard(cusIdcard));
} catch (Exception e) {
return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
index c5b1479..d863212 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReservationController.java
@@ -98,7 +98,7 @@
TjReservation reservation = reservationService.getOne(wq);
if (null != reservation) return AjaxResult.success("鎮ㄥ凡鎴愬姛棰勭害,鏃犻渶鍐嶇害");
try {
- tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ tjReservation.setBirthday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()));
} catch (Exception e) {
e.printStackTrace();
}
@@ -112,7 +112,7 @@
tjReservation.setUpdateTime(new Date());
tjReservation.setWechat(String.valueOf(wxuser.getOpenid()));
tjReservation.setConnect(String.valueOf(wxuser.getId()));
- if (null != tjReservation.getProIdList() && tjReservation.getProIdList().size() > 0) {
+ if (null != tjReservation.getProIdList() && !tjReservation.getProIdList().isEmpty()) {
String join = Joiner.on(",").join(tjReservation.getProIdList());
tjReservation.setProIds(join);
}
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 4522bb4..03e3aa7 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("韬唤璇佸彿涓嶆纭�");
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index a303366..86d03a0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1962,7 +1962,7 @@
//鑾峰彇鎷兼帴鍓嶇紑
String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
// String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
- String tjNumber = idUtils.getTjNumber();
+ String tjNumber = idUtils.getNewTjNumberRedisLockAndMysql();
if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
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 6e960a7..bf6ae58 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
@@ -283,7 +283,7 @@
tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
//鍑虹敓鏃ユ湡
try {
- tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ tjReservation.setBirthday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard().replaceAll(" ", "")));
} catch (Exception e) {
return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
}
@@ -380,7 +380,7 @@
List<String> wrongList = new ArrayList<>();
List<TjReservation> rightList = new ArrayList<>();
- List<TjReservation> yyList = new ArrayList<>();
+ List<String> yyList = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
List<TjDwGrouping> groupingMans = null;//鐢�
List<TjDwGrouping> groupingWoMans = null;//濂�
@@ -409,181 +409,126 @@
int count = 0;//鎬昏浜烘暟
int manCount = 0;//鐢风粍浜烘暟
int woManCount = 0;//濂崇粍浜烘暟
- List<String> ids=new ArrayList<>();
+ List<String> ids = new ArrayList<>();
- String errMsg="";
+// String errMsg = "";
for (TjReservation tjReservation : tjReservations) {
+ String name = tjReservation.getName();
String idCard = tjReservation.getIdCard();
String phoe = tjReservation.getPhoe();
- idCard= idCard.replaceAll("[',锛�;.銆� 鈥樷�淽","");
+ name = name.replaceAll("[',锛�;.銆� 鈥樷�淽", "").replaceAll(" ", "");
+ phoe = phoe.replaceAll("[',锛�;.銆� 鈥樷�淽", "").replaceAll(" ", "");
+ idCard = idCard.replaceAll("[',锛�;.銆� 鈥樷�淽", "").replaceAll(" ", "");
if (!StringUtils.isBlank(idCard) || !StringUtils.isBlank(phoe) || null != tjReservation.getDwxm()) {
//灏嗙瀛﹁鏁扮殑鎵嬫満鍙疯浆鎹㈡垚鏂囨湰褰㈠紡
phoe = MatchUtils.translateToPlainStr(tjReservation.getPhoe());
- if(!ids.isEmpty() && ids.contains(tjReservation.getIdCard())){
+ if (!ids.isEmpty() && ids.contains(idCard)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("姝よ韩浠借瘉鍙�: "+tjReservation.getIdCard()+" 閲嶅,璇锋牳瀵瑰悗涓婁紶!");
+ return AjaxResult.error("姝よ韩浠借瘉鍙�: " + tjReservation.getIdCard() + " 閲嶅,璇锋牳瀵瑰悗涓婁紶!");
}
- ids.add(tjReservation.getIdCard());
+ ids.add(idCard);
- // if (sfjysfzh.equalsIgnoreCase("Y") || sfjysjh.equalsIgnoreCase("Y")) {
- 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 {
+ if (!Objects.equals(tjReservation.getSex(), MatchUtils.getSexByIdCard(idCard))){
+ wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"浠ヤ笅浜哄憳鎬у埆 涓嶅噯纭�");
+ log.info(tjReservation.getName() + " " + idCard);
+ }
+ if ((sfjysfzh.equalsIgnoreCase("Y") && !MatchUtils.isIdCard(idCard)) ||
+ (sfjysjh.equalsIgnoreCase("Y") && !MatchUtils.isMobileNO(phoe))) {
+ wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�");
+// errMsg = "韬唤璇佸彿/鎵嬫満鍙� 鏍煎紡涓嶅噯纭�";
+ log.info(tjReservation.getName() + " " + idCard + MatchUtils.isIdCard(idCard) + " " + phoe + " " + MatchUtils.isMobileNO(phoe));
+ }
+// else {
- tjReservation.setPhoe(phoe);
+ tjReservation.setPhoe(phoe);
- //骞撮緞
- tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
- //鍑虹敓鏃ユ湡
- try {
- tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
- } catch (Exception e) {
- return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
- }
+ tjReservation.setName(name);
- 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())) {
- tjReservation.setGroupingId(groupingMan.getId());
- tjReservation.setGroupingName(groupingMan.getGroupingName());
- tjReservation.setYsPrice(groupingMan.getYsPrice());
- //鍚堣
- hjMoney = hjMoney.add(groupingMan.getYsPrice());
- count += 1;
- //鐢风粍浜烘暟
- manMoney = manMoney.add(groupingMan.getYsPrice());
- manCount += 1;
- }
- }
+ tjReservation.setIdCard(idCard);
- for (TjDwGrouping groupingWoMan : groupingWoMans) {
- if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) {
- tjReservation.setGroupingId(groupingWoMan.getId());
- tjReservation.setGroupingName(groupingWoMan.getGroupingName());
- tjReservation.setYsPrice(groupingWoMan.getYsPrice());
- //鍚堣
- hjMoney = hjMoney.add(groupingWoMan.getYsPrice());
- count += 1;
- woManMoney = woManMoney.add(groupingWoMan.getYsPrice());
- woManCount += 1;
- }
- }
- for (TjDwGrouping groupingWz : groupingWzs) {
- if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) {
- tjReservation.setGroupingId(groupingWz.getId());
- tjReservation.setGroupingName(groupingWz.getGroupingName());
- tjReservation.setYsPrice(groupingWz.getYsPrice());
- //鍚堣
- hjMoney = hjMoney.add(groupingWz.getYsPrice());
- count += 1;
- if (tjReservation.getSex() == 0) {
- manMoney = manMoney.add(groupingWz.getYsPrice());
- manCount += 1;
- }
- if (tjReservation.getSex() == 1) {
- woManMoney = woManMoney.add(groupingWz.getYsPrice());
- woManCount += 1;
- }
+ //骞撮緞
+ tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard().replaceAll(" ", ""))));
+ //鍑虹敓鏃ユ湡
+ try {
+ tjReservation.setBirthday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard().replaceAll(" ", "")));
+ } catch (Exception e) {
+// return AjaxResult.error("韬唤璇佸彿涓嶆纭�");
+ }
- }
- }
- LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
- wq.eq(TjReservation::getIdCard, tjReservation.getIdCard());
- wq.eq(TjReservation::getIsExpire, 2);
- TjReservation one = tjReservationService.getOne(wq);
- if (null != one) {
- yyList.add(one);
- }
- rightList.add(tjReservation);
- } else {
- wrongList.add(tjReservation.getName());
- errMsg="鎵�閫夐」鐩悕 涓嶆纭�";
+ TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().
+ eq(TjDwDept::getDwDeptName, tjReservation.getDwxm().trim()).eq(TjDwDept::getDwId,dwId));
+ if (null != dwDept) {
+ for (TjDwGrouping groupingMan : groupingMans) {
+ if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
+ tjReservation.setGroupingId(groupingMan.getId());
+ tjReservation.setGroupingName(groupingMan.getGroupingName());
+ tjReservation.setYsPrice(groupingMan.getYsPrice());
+ //鍚堣
+ hjMoney = hjMoney.add(groupingMan.getYsPrice());
+ count += 1;
+ //鐢风粍浜烘暟
+ manMoney = manMoney.add(groupingMan.getYsPrice());
+ manCount += 1;
}
}
- // }
- // else {
- // //灏嗙瀛﹁鏁扮殑鎵嬫満鍙疯浆鎹㈡垚鏂囨湰褰㈠紡
- // String str = MatchUtils.translateToPlainStr(tjReservation.getPhoe());
- // tjReservation.setPhoe(str);
- //
- // //骞撮緞
- // tjReservation.setAge(String.valueOf(MatchUtils.getAgeByIdCard(tjReservation.getIdCard())));
- // //鍑虹敓鏃ユ湡
- // tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
- //
- // TjDwDept dwDept = dwDeptService.getOne(new LambdaQueryWrapper<TjDwDept>().eq(TjDwDept::getDwDeptName, tjReservation.getDwxm()));
- // if (null != dwDept) {
- // for (TjDwGrouping groupingMan : groupingMans) {
- // if (null != groupingMan && groupingMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingMan.getDwDeptId().equals(dwDept.getId())) {
- // tjReservation.setGroupingId(groupingMan.getId());
- // tjReservation.setGroupingName(groupingMan.getGroupingName());
- // tjReservation.setYsPrice(groupingMan.getYsPrice());
- // //鍚堣
- // hjMoney = hjMoney.add(groupingMan.getYsPrice());
- // count += 1;
- // //鐢风粍浜烘暟
- // manMoney = manMoney.add(groupingMan.getYsPrice());
- // manCount += 1;
- // }
- // }
- //
- // for (TjDwGrouping groupingWoMan : groupingWoMans) {
- // if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) {
- // tjReservation.setGroupingId(groupingWoMan.getId());
- // tjReservation.setGroupingName(groupingWoMan.getGroupingName());
- // tjReservation.setYsPrice(groupingWoMan.getYsPrice());
- // //鍚堣
- // hjMoney = hjMoney.add(groupingWoMan.getYsPrice());
- // count += 1;
- // woManMoney = woManMoney.add(groupingWoMan.getYsPrice());
- // woManCount += 1;
- // }
- // }
- // for (TjDwGrouping groupingWz : groupingWzs) {
- // if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) {
- // tjReservation.setGroupingId(groupingWz.getId());
- // tjReservation.setGroupingName(groupingWz.getGroupingName());
- // tjReservation.setYsPrice(groupingWz.getYsPrice());
- // //鍚堣
- // hjMoney = hjMoney.add(groupingWz.getYsPrice());
- // count += 1;
- // if (tjReservation.getSex() == 0) {
- // manMoney = manMoney.add(groupingWz.getYsPrice());
- // manCount += 1;
- // }
- // if (tjReservation.getSex() == 1) {
- // woManMoney = woManMoney.add(groupingWz.getYsPrice());
- // woManCount += 1;
- // }
- //
- // }
- // }
- // LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
- // wq.eq(TjReservation::getIdCard, tjReservation.getIdCard());
- // wq.eq(TjReservation::getIsExpire, 2);
- // TjReservation one = tjReservationService.getOne(wq);
- // if (null != one) {
- // yyList.add(one);
- // }
- // rightList.add(tjReservation);
- // } else {
- // wrongList.add(tjReservation.getName());
- // }
- // }
- } else {
- wrongList.add(tjReservation.getName());
- errMsg="韬唤璇佸彿/鎵嬫満鍙�/椤圭洰鍚嶄负绌�";
+ for (TjDwGrouping groupingWoMan : groupingWoMans) {
+ if (null != groupingWoMan && groupingWoMan.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWoMan.getDwDeptId().equals(dwDept.getId())) {
+ tjReservation.setGroupingId(groupingWoMan.getId());
+ tjReservation.setGroupingName(groupingWoMan.getGroupingName());
+ tjReservation.setYsPrice(groupingWoMan.getYsPrice());
+ //鍚堣
+ hjMoney = hjMoney.add(groupingWoMan.getYsPrice());
+ count += 1;
+ woManMoney = woManMoney.add(groupingWoMan.getYsPrice());
+ woManCount += 1;
+ }
+ }
+ for (TjDwGrouping groupingWz : groupingWzs) {
+ if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) {
+ tjReservation.setGroupingId(groupingWz.getId());
+ tjReservation.setGroupingName(groupingWz.getGroupingName());
+ tjReservation.setYsPrice(groupingWz.getYsPrice());
+ //鍚堣
+ hjMoney = hjMoney.add(groupingWz.getYsPrice());
+ count += 1;
+ if (tjReservation.getSex() == 0) {
+ manMoney = manMoney.add(groupingWz.getYsPrice());
+ manCount += 1;
+ }
+ if (tjReservation.getSex() == 1) {
+ woManMoney = woManMoney.add(groupingWz.getYsPrice());
+ woManCount += 1;
+ }
+
+ }
+ }
+ LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjReservation::getIdCard, tjReservation.getIdCard());
+ wq.eq(TjReservation::getIsExpire, 2);
+ TjReservation one = tjReservationService.getOne(wq);
+ if (null != one) {
+ yyList.add(one.getName() + " " + tjReservation.getIdCard());
+ } else {
+ rightList.add(tjReservation);
+ }
+
+ } else {
+ wrongList.add(tjReservation.getName() + " " + tjReservation.getIdCard()+"鎵�濉啓鐨勫椁愬垎绫诲悕 涓嶆纭�");
+ }
+// }
+
+ }
+ else {
+ wrongList.add(tjReservation.getName()+"韬唤璇佸彿/鎵嬫満鍙�/濂楅鍒嗙被鍚嶅悕涓虹┖");
}
}
+
+
if (!yyList.isEmpty()) {
map.put("list", yyList);
map.put("hjMoney", hjMoney);
@@ -593,7 +538,7 @@
if (!wrongList.isEmpty()) {
map.put("list", wrongList);
map.put("hjMoney", hjMoney);
- return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!"+errMsg, map);
+ return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵归敊璇俊鎭悗閲嶆柊瀵煎叆!!!", map);
} else {
map.put("list", rightList);
map.put("count", count);
@@ -606,7 +551,7 @@
}
} catch (NoTransactionException e) {
// throw new RuntimeException(e);
- log.error(String.valueOf(e),e.getMessage());
+ log.error(String.valueOf(e), e.getMessage());
return AjaxResult.error();
}
}
@@ -640,7 +585,7 @@
if (null != reservation) return AjaxResult.success("鎮ㄥ凡鎴愬姛棰勭害,鏃犻渶鍐嶇害");
//tjReservation.setAge(MatchUtils.getAgeByIdCard(tjReservation.getIdCard()));
try {
- tjReservation.setBirthday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard()), "yyyy-MM-dd"));
+ tjReservation.setBirthday(MatchUtils.getBirthDayByIdCard(tjReservation.getIdCard().replaceAll(" ", "")));
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java
index e525189..5952351 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/MatchUtils.java
@@ -1,12 +1,12 @@
package com.ltkj.framework.config;
+import cn.hutool.core.date.DateUtil;
import com.ltkj.common.utils.StringUtils;
import java.math.BigDecimal;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -248,7 +248,7 @@
/**
* @desc 閫氳繃韬唤璇佽幏鍙栧嚭鐢熸棩鏈�
*/
- public static String getBirthDayByIdCard(String idCard) throws Exception {
+ public static Date getBirthDayByIdCard(String idCard) throws Exception {
if (!isIdCard(idCard)) {
throw new Exception("韬唤璇佷笉姝ｇ‘");
}
@@ -258,7 +258,14 @@
int year = Integer.parseInt(birth.substring(0, 4));
int month = Integer.parseInt(birth.substring(4, 6));
int day = Integer.parseInt(birth.substring(6, 8));
- return year + "-" + month + "-" + day;
+ String sr= year + "-" + month + "-" + day;
+ // 瑙ｆ瀽涓� Date
+ Date date = DateUtil.parse(sr, "yyyy-MM-dd");
+ // 杞崲涓� LocalDateTime
+ LocalDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+ // 璁剧疆鍥哄畾鏃跺垎绉�
+ dateTime = dateTime.withHour(12).withMinute(34).withSecond(56);
+ return Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
}
/**
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
index b9f364b..f4ab2ee 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java
@@ -88,7 +88,7 @@
public int selectTjDwGroupingByDwDeptId(String dwDeptId);
- @Select("SELECT SUM(b.aa) cc FROM ( SELECT\n" +
+ @Select("SELECT IFNULL(SUM(b.aa),0) cc FROM ( SELECT\n" +
" CASE WHEN ISNULL( b.sex )\n" +
" AND ISNULL( c.pro_name ) THEN 0\n" +
" WHEN !ISNULL( b.sex )\n" +
--
Gitblit v1.8.0