From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 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 37c8d1a..3f4bde8 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
@@ -10,17 +10,14 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjOrder;
-import com.ltkj.hosp.domain.TjOrderRemark;
-import com.ltkj.hosp.domain.TjProject;
+import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.checkerframework.checker.units.qual.A;
+import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.ConvertingCursor;
import org.springframework.data.redis.core.Cursor;
@@ -30,12 +27,12 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
import static com.ltkj.framework.datasource.DynamicDataSourceContextHolder.log;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
@@ -47,13 +44,10 @@
public class TjSqlController extends BaseController {
@Resource
private TestMapper testMapper;
-
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
-
@Resource
private LtkjMiddleDetailService middleDetailService;
-
@Resource
private LtkjMiddleHeadService headService;
@Resource
@@ -64,16 +58,8 @@
private LtkjHybgdService ltkjHybgdService;
@Resource
private LtkjHysqdService ltkjHysqdService;
- @Autowired
- public RedisTemplate<Object,Object> redisTemplate;
@Resource
private ITjCustomerService tjCustomerService;
- @Resource
- private RedisCache redisCache;
- @Resource
- private TjAsyncService asyncService;
- @Resource
- private ITjOrderRemarkService remarkService;
@Resource
private ITjOrderService orderService;
@Resource
@@ -82,26 +68,42 @@
private LtkjHisUserService hisUserService;
@Resource
private ITjProjectService tjProjectService;
+ @Autowired
+ private ITjOrderDetailService tjOrderDetailService;
+ @Resource
+ private ITjOrderRemarkService tjOrderRemarkService;
+ @Resource
+ private ITjProjectService projectService;
+
@GetMapping("/getTjHyBgList")
@ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�")
- public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode,
- @RequestParam(required = false)String pacName,
- @RequestParam(required = false)String pacRemark) {
- List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
- DynamicDataSourceContextHolder.clearDataSourceType();
- return AjaxResult.success(maps);
+ public AjaxResult getTjHyBgList(@RequestParam(defaultValue = "1")Integer page,
+ @RequestParam(defaultValue = "10")Integer pageSize,
+ @RequestParam(required = false)String pname,
+ @RequestParam(required = false)String pid,
+ @RequestParam(required = false)String pym,
+ @RequestParam(required = false)String checktype) {
+// List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
+// DynamicDataSourceContextHolder.clearDataSourceType();
+ Map<String,Object> map= projectService.getTjHyBgList(page,pageSize,pname,pid,pym,checktype);
+ return AjaxResult.success(map);
}
@GetMapping("/newGetTjPat")
- @ApiOperation(value = "鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
+ @ApiOperation(value = "A------鏂扮殑鏌ヨ浣撴淇℃伅鎺ュ彛")
public AjaxResult newGetTjPat(@RequestParam(required = false)String pacCode,
@RequestParam(required = false)String pacName,
@RequestParam(required = false)String pacRemark) {
-// List<Map<String, Object>> maps = testMapper.newGetTjPat111111(pacName);
List<Map<String, Object>> maps = testMapper.newGetTjPat(pacCode,pacName,pacRemark);
DynamicDataSourceContextHolder.clearDataSourceType();
+ List<String> strings = orderService.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);
}
@@ -404,7 +406,7 @@
//鍚屾鍖栭獙椤圭洰
testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(), "1");
//鍚屾妫�鏌ラ」鐩�
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1");
+// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()),order.getTjNumber(),"1");
}
// }
return AjaxResult.success("鍚屾鎴愬姛");
@@ -415,7 +417,7 @@
@GetMapping("/getTjYxjcList")
@ApiOperation(value = "鏌ヨ褰卞搷妫�鏌ラ」鐩�")
public AjaxResult getTjYxjcList() {
- List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList("鏉ㄤ簯浜�",null,null,null);
+ List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList("鏉ㄤ簯浜�",null,null);
return AjaxResult.success(tjYxjcList);
}
@@ -439,4 +441,26 @@
}
+ @GetMapping("/getHuaYanProByTjNum")
+ @ApiOperation(value = "鏍规嵁浣撴鍙锋煡璇㈠寲楠岄」鐩帴鍙�")
+ public AjaxResult getHuaYanProByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ Map<String,Object> map=new HashMap<>();
+
+ List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.addHuaYanTable(tjNumber);
+ List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.addHuaYanTable(tjNumber);
+ map.put("tjOrderDetails",tjOrderDetails);
+ map.put("tjOrderRemarks",tjOrderRemarks);
+ return AjaxResult.success(map);
+ }
+
+
+ @GetMapping("/getWsxmLtkjHysqdByLisViBySLAVEWS")
+ @ApiOperation(value = "鏌ヨ澶栭�侀」鐩甋qlServer鎺ュ彛")
+ public AjaxResult getWsxmLtkjHysqdByLisViBySLAVEWS(@RequestParam String s) {
+// List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisViBySLAVEWS(s);
+// log.info(wsbg.toString());
+ return AjaxResult.success(testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s));
+ }
+
+
}
--
Gitblit v1.8.0