From 9a7ee34013ff0a0eb9a65d76ced42b4f13f3e4d4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 13 三月 2025 17:39:22 +0800
Subject: [PATCH] 从lis、pacs视图查询增加携带院区 修改签到登记价格问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 34b884e..c359143 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -48,6 +48,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.Collator;
import java.util.*;
@@ -398,8 +399,8 @@
@ApiOperation (value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
// @Transactional
- public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
-
+ public AjaxResult dataSynchronization(@RequestParam String tjNumber, HttpServletRequest request) {
+ String hospId = request.getHeader("hospId");
RLock lock = redissonClient.getLock("lock:check:dataSynchronization:" + tjNumber);
try {
boolean tryLock = lock.tryLock(3L, TimeUnit.SECONDS);
@@ -656,7 +657,7 @@
return AjaxResult.success("鍚屾鎴愬姛");
}
else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(),hospId);
if(null != hysqdList && !hysqdList.isEmpty()){
for (LtkjHysqd hysqd : hysqdList) {
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(),hysqd.getTmh());
@@ -671,12 +672,12 @@
}
DynamicDataSourceContextHolder.clearDataSourceType();
}
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber());
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber(),hospId);
if(null !=jcsqdList && !jcsqdList.isEmpty()){
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
jcsqdService.saveBatch(jcsqdList);
- List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId());
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId(),hospId);
if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
}
--
Gitblit v1.8.0