From e61f0a9cc2e229dd6f8156cc020e59ee3c164a01 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 26 十二月 2023 09:48:19 +0800
Subject: [PATCH] zjh 本地 2023/12/25 -1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java | 5 +++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjDwGroupingMapper.java | 6 ++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 9 ++++++---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java | 3 +++
5 files changed, 25 insertions(+), 3 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 9b89654..23daefe 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
@@ -293,9 +293,10 @@
if(null !=tjCustomer.getIdType()){
if(tjCustomer.getIdType().equals("1")){
b = MatchUtils.isIdCard(cusIdcard);
- }else {
- b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
}
+// else {
+// b = MatchUtils.cardValidate(cusIdcard, tjCustomer.getIdType());
+// }
}else {
return AjaxResult.error("璇烽�夋嫨璇佷欢绫诲瀷");
}
@@ -320,7 +321,9 @@
String substring = cusIdcard.substring(cusIdcard.length() - 6);
substring = DigestUtils.md5DigestAsHex(substring.getBytes());
tjCustomer.setCusPassword(substring);
- tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ if(tjCustomer.getIdType().equals("1")){
+ tjCustomer.setCusBrithday(DateUtil.parse(MatchUtils.getBirthDayByIdCard(tjCustomer.getCusIdcard()), "yyyy-MM-dd"));
+ }
tjCustomer.setCusNumber(0L);
if (tjCustomerService.save(tjCustomer)) {
return AjaxResult.success(tjCustomer);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
index 6834839..7d2b254 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDwGroupingController.java
@@ -104,10 +104,15 @@
|| (null==tjDwGrouping.getPacName()||"".equals(tjDwGrouping.getPacName()))){
return AjaxResult.error("蹇呭～椤逛笉鑳戒负绌�!");
}
+ int i = tjDwGroupingService.selectTjDwGroupingBySex(tjDwGrouping.getDwDeptId(), tjDwGrouping.getSex());
+ if(i>0){
+ return AjaxResult.error("璇ユ�у埆鍒嗙粍宸插瓨鍦ㄤ笉鍙噸澶嶅垱寤�");
+ }
tjDwGrouping.setDwDeptName(compService.getById(tjDwGrouping.getDwId()).getCnName());
if (tjDwGroupingService.saveOrUpdate(tjDwGrouping)) {
if(null !=tjDwGrouping.getMapList() && tjDwGrouping.getMapList().size()>0){
// groupingProService.remove(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId,tjDwGrouping.getId()));
+ // TODO: 2023/12/25 鎸夌収鎬у埆鍒犻櫎
groupingProService.deletedTjGroupingProByGroupingId(tjDwGrouping.getId());
for (Map<String, Object> map : tjDwGrouping.getMapList()) {
TjGroupingPro groupingPro=new TjGroupingPro();
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 a6cdde3..9b27272 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
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjDwGrouping;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
/**
* 浣撴鍗曚綅鍒嗙粍Mapper鎺ュ彛
@@ -61,4 +63,8 @@
* @return 缁撴灉
*/
public int deleteTjDwGroupingByIds(String[] ids);
+
+
+ @Select("SELECT COUNT(*) FROM tj_dw_grouping a WHERE a.dw_dept_id=#{dwDeptId} AND a.sex=#{sex} ")
+ public int selectTjDwGroupingBySex(@Param("dwDeptId")String dwDeptId,@Param("sex") String sex);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
index 1bfb3b4..b6b6954 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjDwGroupingService.java
@@ -59,4 +59,7 @@
* @return 缁撴灉
*/
public int deleteTjDwGroupingById(String id);
+
+
+ public int selectTjDwGroupingBySex(String dwDeptId,String sex);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
index ac40fc0..410d2c2 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjDwGroupingServiceImpl.java
@@ -89,4 +89,9 @@
public int deleteTjDwGroupingById(String id) {
return tjDwGroupingMapper.deleteTjDwGroupingById(id);
}
+
+ @Override
+ public int selectTjDwGroupingBySex(String dwDeptId, String sex) {
+ return tjDwGroupingMapper.selectTjDwGroupingBySex(dwDeptId,sex);
+ }
}
--
Gitblit v1.8.0