From d251236f861452678eab9de0657ec46ba53930e6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 19 三月 2024 14:08:58 +0800
Subject: [PATCH] zjh 2024/03/19--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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..162502c 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
@@ -24,9 +24,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;
/**
@@ -66,7 +69,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 +121,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 +248,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());
--
Gitblit v1.8.0