From ccbcd23becc1359f26d8cc571005e546e2ed6053 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 22 五月 2024 17:59:39 +0800
Subject: [PATCH] zjh 2024/05/22-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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 3007a46..1be7465 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
@@ -7,6 +7,7 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
+import com.ltkj.hosp.domain.TjCustomerBlack;
import com.ltkj.hosp.domain.TjReservation;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
@@ -24,9 +25,12 @@
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
+
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
@@ -58,6 +62,8 @@
private LtkjMiddleDetailService middleDetailService;
@Resource
private ITjOrderService tjOrderService;
+ @Resource
+ private TjCustomerBlackService blackService;
@GetMapping("/newGetTjPat")
@ApiOperation(value = "鏌ヨhis鏁版嵁搴撹繑鍥炴柊鐨勬暟鎹�")
@@ -66,7 +72,28 @@
@RequestParam(required = false)String pacRemark) {
List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
+// List<Map<String, Object>> list=new ArrayList<>();
+// if(null !=maps && maps.size()>0){
+// for (Map<String, Object> map : maps) {
+// String pacCode1 = map.get("pacCode").toString();
+// List<String> s = tjOrderService.selectTjOrderByCardId1();
+// if(null !=s && s.size()>0){
+// if(s.contains(pacCode1)){
+//// maps.remove(map);
+// continue;
+// }
+// list.add(map);
+// }
+// }
+// }
+ List<String> strings = tjOrderService.selectTjOrderByCardId1();
+ if(null !=strings && strings.size()>0){
+ List<Map<String, Object>> collect = maps.stream()
+ .filter(item -> !strings.contains(item.get("pacCode").toString())).collect(Collectors.toList());
+ return AjaxResult.success(collect);
+ }
return AjaxResult.success(maps);
+// return AjaxResult.success(maps);
}
@@ -97,8 +124,11 @@
LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
if(null != tjPatByIdCard){
String fcardNo = tjPatByIdCard.getFcardNo();
- if(null !=fcardNo){
+ if(null !=fcardNo && !fcardNo.equals("")){
fcardNo=fcardNo.trim();
+ tjPatByIdCard.setFcardNo(fcardNo);
+ }else {
+ fcardNo=cusIdcard.trim();
tjPatByIdCard.setFcardNo(fcardNo);
}
//鏍规嵁韬唤璇佸彿浠庢暟鎹簱鎷夸俊鎭� 娌℃湁鐨勮瘽淇濆瓨
@@ -221,6 +251,12 @@
//浠巋is琛ㄦ姄鏁版嵁
LtkjMiddleHead pat = testMapper.getMiddleHeadByPartId(customer.getCardId());
if (null != pat) {
+ LambdaQueryWrapper<LtkjMiddleHead> wq1=new LambdaQueryWrapper<>();
+ wq1.eq(LtkjMiddleHead::getFeadId,customer.getCardId());
+ headService.remove(wq1);
+ LambdaQueryWrapper<LtkjMiddleDetail> wq0=new LambdaQueryWrapper<>();
+ wq0.eq(LtkjMiddleDetail::getFheadId,pat.getFeadId());
+ middleDetailService.remove(wq0);
List<LtkjMiddleDetail> list = testMapper.getMiddleDetailByFeadId(pat.getFeadId());
DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
LtkjMiddleHead o = headService.getMiddleHeadByPartId(customer.getCardId());
@@ -247,9 +283,15 @@
List<TjCustomer> list = tjCustomerService.selectTjCustomerList(tjCustomer);
if(null !=list && list.size()>0){
for (TjCustomer customer : list) {
- customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+// customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ TjCustomerBlack tjCustomerBlack = blackService.isTjCustomerBlack(String.valueOf(customer.getCusId()));
+ if(null !=tjCustomerBlack){
+ customer.setIsBlack("Y");
+ }else {
+ customer.setIsBlack("N");
+ }
}
}
return getDataTable(list);
--
Gitblit v1.8.0