From d5393909a140c863a40cabb9bee43d8a324969e0 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期二, 05 三月 2024 14:33:04 +0800
Subject: [PATCH] zjh 本地 2024/03/5 -1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 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 b46cc9d..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);
     }
 
 

--
Gitblit v1.8.0