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/config/timer/AsyncResultTask.java | 14 ++--
ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java | 14 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java | 25 ++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 63 +++++++++++++++-----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 11 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 49 ++++++++++++++--
6 files changed, 123 insertions(+), 53 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
index 75ac273..44abae9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -139,7 +139,7 @@
if (null != jy && !jy.isEmpty()) {
log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
for (String s : jy) {
- extractedjianyan(s);
+ extractedjianyan(s,dictHosp.getCode());
}
}
@@ -147,7 +147,7 @@
if (null != jc && !jc.isEmpty()) {
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
- extractedjiancha(s);
+ extractedjiancha(s,dictHosp.getCode());
}
}
Map<String, Object> map = new HashMap<>();
@@ -223,7 +223,7 @@
taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
}
- private void extractedjianyan(String s) {
+ private void extractedjianyan(String s,String hosp) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
@@ -233,7 +233,7 @@
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,hosp);
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
if (null != hysqdList && !hysqdList.isEmpty()) {
@@ -261,16 +261,16 @@
}
- private void extractedjiancha(String s) {
+ private void extractedjiancha(String s,String hosp) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hosp);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
- List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hosp);
DynamicDataSourceContextHolder.clearDataSourceType();
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
index f846cee..ad92895 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/DefaultScheduled.java
@@ -174,7 +174,7 @@
if (null != jy && !jy.isEmpty()) {
log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
for (String s : jy) {
- extractedjianyan(s);
+ extractedjianyan(s,yqbm);
}
}
@@ -182,7 +182,7 @@
if (null != jc && !jc.isEmpty()) {
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
- extractedjiancha(s);
+ extractedjiancha(s,yqbm);
}
}
Map<String, Object> map = new HashMap<>();
@@ -251,7 +251,7 @@
return time.isAfter(LocalTime.of(Integer.parseInt(kssj), 0)) && time.isBefore(LocalTime.of(Integer.parseInt(jssj), 0));
}
- private void extractedjianyan(String s) {
+ private void extractedjianyan(String s,String yqbm) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
@@ -261,7 +261,7 @@
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,yqbm);
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
if (null != hysqdList && !hysqdList.isEmpty()) {
@@ -289,16 +289,16 @@
}
- private void extractedjiancha(String s) {
+ private void extractedjiancha(String s,String yqbm) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,yqbm);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
- List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,yqbm);
DynamicDataSourceContextHolder.clearDataSourceType();
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
index e1aed80..3816648 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateTime;
@@ -192,23 +193,23 @@
@GetMapping ("/shoudongtbjyjcwsxmjg")
@ApiOperation(value = "鎵嬪姩鍚屾妫�楠屾鏌ュ閫侀」鐩粨鏋滄帴鍙�")
public AjaxResult shoudongtbjyjcwsxmjg(@RequestParam @ApiParam(value = "jy妫�楠� jc妫�鏌� jyjc妫�楠屽拰妫�鏌�") String tblx,
- @ApiParam(value = "浣撴鍙�")@RequestParam String tjh) {
-
- log.info("鎵嬪姩鍚屾妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
+ @ApiParam(value = "浣撴鍙�")@RequestParam String tjh, HttpServletRequest request) {
+ String hospId = request.getHeader("hospId");
+ log.info("鎵嬪姩鍚屾妫�楠屾垨妫�鏌ョ粨鏋滃紑濮�->{}{}",hospId,DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss"));
try {
switch (tblx){
case "jy":
- tbjianyan(tjh);
+ tbjianyan(tjh,hospId);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠�");
break;
case "jc":
- tbjiancha(tjh);
+ tbjiancha(tjh,hospId);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�鏌�");
break;
case "jyjc":
- tbjianyan(tjh);
- tbjiancha(tjh);
+ tbjianyan(tjh,hospId);
+ tbjiancha(tjh,hospId);
log.info("褰撳墠鍚屾鐨勬槸->{} 缁撴灉","妫�楠屾鏌�");
break;
default:
@@ -228,7 +229,7 @@
return AjaxResult.success();
}
- private void tbjianyan(String s) {
+ private void tbjianyan(String s,String hosp) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
@@ -239,7 +240,7 @@
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,hosp);
log.info("鍘焗ysqdList->{} 缁撴灉", JSONUtil.parseObj(hysqdList));
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
if(null !=wssq && !wssq.isEmpty()){
@@ -272,16 +273,16 @@
}
- private void tbjiancha(String s) {
+ private void tbjiancha(String s,String hosp) {
String yqbm = configService.selectConfigByKey("common_api_service_hospbm");
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hosp);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
- List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hosp);
DynamicDataSourceContextHolder.clearDataSourceType();
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
for (LtkjExamJcsqd jcsqd : jcsqdList) {
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();
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index a442cf0..f4d4bc9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1402,6 +1402,7 @@
wrapper.gt(TbTransition::getNowPrice, 0);
List<TbTransition> list = tbTransitionService.list(wrapper);
+ BigDecimal zongjia = new BigDecimal("0.0");
for (TbTransition transition : list) {
LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(TjProject::getProId, transition.getProId());
@@ -1412,7 +1413,8 @@
SysDept dept = sysDeptService.getOne(wrapper2);
JSONObject obj = JSONUtil.createObj();
- Integer sl = project.getSl();
+// Integer sl = project.getSl();
+ int sl = 1;
BigDecimal danjia = transition.getNowPrice();
BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
obj.putOpt("danJia", danjia);
@@ -1423,8 +1425,10 @@
obj.putOpt("shouFeiXmId", project.getHisXmbm());
obj.putOpt("shouFeiXmMc", project.getHisXmmc());
array.add(obj);
+ zongjia = zongjia.add(allPrice);
}
map.put("feiYongInfoList", array);
+ log.info("璋冪敤His鎺ュ彛鍓� 鏀惰垂鎬讳环:{}", zongjia.toString());
String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
JSONObject object = JSONUtil.parseObj(post);
@@ -3948,7 +3952,9 @@
public AjaxResult updateTransitionnewPrice(@RequestBody List<UpdateTransitionnewPriceDto> dtos) {
if (null != dtos && !dtos.isEmpty()) {
+ int index = 0;
for (UpdateTransitionnewPriceDto dto : dtos) {
+ index++;
LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
wq.eq(TbTransition::getCusId, dto.getCusIdCard());
wq.eq(TbTransition::getParentProId, dto.getParentProId());
@@ -3959,22 +3965,47 @@
log.info("鎶樻墸涓�: " + new BigDecimal(dto.getDiscount()));
if (null != list && !list.isEmpty()) {
BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
- for (TbTransition transition : list) {
- BigDecimal ordPrice = transition.getOrdPrice();
- BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
- log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply);
- transition.setNowPrice(multiply);
- transition.setDiscount(new BigDecimal(dto.getDiscount()));
- transitionService.updateById(transition);
- }
- if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) {
- List<TbTransition> transitionList = list.stream().filter(a ->
- transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
- if (!transitionList.isEmpty()) {
- TbTransition tbTransition = transitionList.get(0);
- tbTransition.setNowPrice(dxzj);
- transitionService.updateById(tbTransition);
+ log.info("dxzj:{}",dxzj.toString());
+ if (index == dtos.size()){
+ BigDecimal yhj = dto.getYhj();
+ log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
+ BigDecimal cj = yhj.subtract(dxzj);
+ log.info("璁＄畻鐨勫樊浠凤細{}",cj.toString());
+ int index1 = 0;
+ for (TbTransition transition : list) {
+ BigDecimal ordPrice = transition.getOrdPrice();
+ BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+ if (index1 == 0){
+ log.info("淇敼灏忛」 {}{} 鍘熸湰浠锋牸:{}",transition.getProId(),transition.getProName(),multiply.toString());
+ multiply = multiply.add(cj);
+ log.info("澧炲姞宸环鍚庯細{}",multiply.toString());
+ }
+ index1++;
+ log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+ transition.setNowPrice(multiply);
+ transition.setDiscount(new BigDecimal(dto.getDiscount()));
+ transitionService.updateById(transition);
}
+ }else {
+ for (TbTransition transition : list) {
+ BigDecimal ordPrice = transition.getOrdPrice();
+ BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+ log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+// log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+ transition.setNowPrice(multiply);
+ transition.setDiscount(new BigDecimal(dto.getDiscount()));
+ transitionService.updateById(transition);
+ }
+// if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) {
+// List<TbTransition> transitionList = list.stream().filter(a ->
+// transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
+// if (!transitionList.isEmpty()) {
+// TbTransition tbTransition = transitionList.get(0);
+// tbTransition.setNowPrice(dxzj);
+// transitionService.updateById(tbTransition);
+// }
+// }
}
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index c577c8a..009d37f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -257,6 +257,26 @@
@DataSource(value = DataSourceType.SLAVE_LIS)
+// @Select("SELECT\n" +
+// " a.GH_PATIENTNO tjh,\n" +
+// " a.SAMPLEID tmh,\n" +
+// " NULL bbbh,\n" +
+// " NULL bbmc,\n" +
+// " a.SFXMID xmid,\n" +
+// " REPLACE(a.SFXMNAME,'tj_','') xmmc,\n" +
+// " a.SENDDATE sqsj,\n" +
+// " a.SENDDOCTOR sqys,\n" +
+// " a.CHECKDATE jgsj,\n" +
+// " a.TXM sqdh,\n" +
+// " a.SENDDOCTOR sqrxm,\n" +
+// " '8001' sqrdm,\n" +
+// " a.AUDITDOCTOR shrxm,\n" +
+// " '宸插' jybgjg,\n" +
+// " SYSDATE() create_time\n" +
+// " \n" +
+// "FROM\n" +
+// " vi_his_patientinfo a\n" +
+// "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum}")
@Select("SELECT\n" +
" a.GH_PATIENTNO tjh,\n" +
" a.SAMPLEID tmh,\n" +
@@ -276,8 +296,8 @@
" \n" +
"FROM\n" +
" vi_his_patientinfo a\n" +
- "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum}")
- List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(String tjNum);
+ "WHERE a.PATIENTTYPE=3 AND a.GH_PATIENTNO =#{tjNum} AND a.HOSPITALID = #{hosp}")
+ List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
@@ -381,11 +401,28 @@
" SYSDATE create_time\n" +
" \n" +
"FROM\n" +
- " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}")
- List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(String tjNum);
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+ List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
@DataSource(value = DataSourceType.SLAVE_PACS)
+// @Select(" SELECT\n" +
+// " trim(a.HIS_ID) tjh,\n" +
+// " trim(a.HIS_ID) tmh,\n" +
+// " trim(a.JCMID) xmdm,\n" +
+// " a.JCMC xmmc,\n" +
+// " NULL bg_mig,\n" +
+// " NULL bg_url,\n" +
+// " TRIM(a.JCSJ) bg_nr,\n" +
+// " a.SHYS shysdm,\n" +
+// " a.SHYS shysxm,\n" +
+// " TRIM(a.JCJL) yxbx,\n" +
+// " a.BGSJ zdsj,\n" +
+// " a.SQRJ sqsj,\n" +
+// " a.JCBW jcbw,\n" +
+// " SYSDATE create_time\n" +
+// "FROM\n" +
+// " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum}")
@Select(" SELECT\n" +
" trim(a.HIS_ID) tjh,\n" +
" trim(a.HIS_ID) tmh,\n" +
@@ -402,8 +439,8 @@
" a.JCBW jcbw,\n" +
" SYSDATE create_time\n" +
"FROM\n" +
- " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum}")
- List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(String tjNum);
+ " ris.V_TJ_JCBGXX_NEWTJ a WHERE a.HIS_ID=#{tjNum} AND a.HOSTPITALID = #{hosp}")
+ List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(@Param("tjNum") String tjNum,@Param("hosp") String hosp);
List<List<?>> tjplUpdateDetatilByVi(Map<String,Object> map);
--
Gitblit v1.8.0