From a6ae7c44fccca62e535c763aae0e599d2f3f73b0 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 29 五月 2024 14:27:53 +0800
Subject: [PATCH] 增加通过多个base64PDF合并为一个
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 22 +---------------------
1 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
index 4794803..f563a38 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -101,28 +101,9 @@
@ApiOperation(value = "A------鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
@RequestParam(required = false)String pacName,
- @RequestParam(required = false)String pacRemark, HttpServletRequest request,
- HttpSession session) {
-
-// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName);
+ @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 = orderService.selectTjOrderByCardId1();
-// if(null !=s && s.size()>0){
-// if(s.contains(pacCode1)){
-//// maps.remove(map);
-// continue;
-// }
-// list.add(map);
-// }
-// }
-// }
-// return AjaxResult.success(list);
-
List<String> strings = orderService.selectTjOrderByCardId1();
if(null !=strings && strings.size()>0){
List<Map<String, Object>> collect = maps.stream()
@@ -130,7 +111,6 @@
return AjaxResult.success(collect);
}
return AjaxResult.success(maps);
-// return AjaxResult.success(collect);
}
--
Gitblit v1.8.0