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 | 115 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 42 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 5d0e9c0..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();
}
@@ -742,6 +743,7 @@
List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
//鍚屾妫�楠�
+ String resultMsg = "";
if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
Date dates = new Date();
Map<String, Object> map = new HashMap<>();
@@ -756,38 +758,42 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if (null == code || !code.equals("0")) {
- return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!");
- }
- JSONArray data = object.getJSONArray("ResultData");
- for (Object datum : data) {
- JSONObject jsonObject = (JSONObject) datum;
- boolean isInsertHysqd = false;
- LtkjHysqd hysqd = new LtkjHysqd();
- hysqd.setTjh(order.getCardId());
- hysqd.setTmh(jsonObject.getStr("JYBGID"));
- hysqd.setBbbh(jsonObject.getStr("BBDM"));
- hysqd.setBbmc(jsonObject.getStr("BBMC"));
- hysqd.setXmid(jsonObject.getStr("JYXMDM"));
- hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
- hysqd.setSqsj(jsonObject.getStr("SQRQ"));
- hysqd.setSqys(jsonObject.getStr("SQRBH"));
- hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
- hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
- hysqd.setSqdh(jsonObject.getStr("SQDBH"));
- hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
- hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
- hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
- hysqd.setCreateTime(new Date());
- QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
- List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
- if (list.isEmpty())
- isInsertHysqd = true;
- if (isInsertHysqd){
- saveHysqd(hysqd);
- }else {
- saveHybgd(hysqd);
+// if (null == code || !code.equals("0")) {
+// return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!");
+// }
+ if (null != code && code.equals("0")) {
+ JSONArray data = object.getJSONArray("ResultData");
+ for (Object datum : data) {
+ JSONObject jsonObject = (JSONObject) datum;
+ boolean isInsertHysqd = false;
+ LtkjHysqd hysqd = new LtkjHysqd();
+ hysqd.setTjh(order.getCardId());
+ hysqd.setTmh(jsonObject.getStr("JYBGID"));
+ hysqd.setBbbh(jsonObject.getStr("BBDM"));
+ hysqd.setBbmc(jsonObject.getStr("BBMC"));
+ hysqd.setXmid(jsonObject.getStr("JYXMDM"));
+ hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
+ hysqd.setSqsj(jsonObject.getStr("SQRQ"));
+ hysqd.setSqys(jsonObject.getStr("SQRBH"));
+ hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
+ hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
+ hysqd.setSqdh(jsonObject.getStr("SQDBH"));
+ hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
+ hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
+ hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
+ hysqd.setCreateTime(new Date());
+ QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
+ List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
+ if (list.isEmpty())
+ isInsertHysqd = true;
+ if (isInsertHysqd) {
+ saveHysqd(hysqd);
+ } else {
+ saveHybgd(hysqd);
+ }
}
+ }else {
+ resultMsg = "鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!";
}
//鍚屾鍖栭獙椤圭洰
// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
@@ -851,11 +857,14 @@
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
// testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
}else {
- return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
+ resultMsg = "妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!";
+// return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
}
}
- return AjaxResult.success("鍚屾鎴愬姛");
+ if (StrUtil.isBlank(resultMsg))
+ return AjaxResult.success("鍚屾鎴愬姛");
+ else return AjaxResult.error(resultMsg);
}
//鍖栭獙
// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
@@ -1667,6 +1676,7 @@
List<TjOrderDetail> dels = new ArrayList<>();
for (TjOrderYcxm ycxm : entry.getValue()) {
TjOrderDetail detail=new TjOrderDetail();
+ detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
detail.setProName(ycxm.getJcxm());
detail.setProResult(ycxm.getJcjg());
detail.setStanId(ycxm.getCkfw());
@@ -1699,6 +1709,9 @@
.filter(b -> maps.stream()
.noneMatch(a -> a.get("proName").equals(b.get("proName")))) // 杩囨护鎺夊湪 maps 涓瓨鍦ㄧ殑鐩稿悓鍏冪礌
.collect(Collectors.toList());
+
+
+
if(!collect.isEmpty()){
maps.addAll(collect);
}
@@ -1722,6 +1735,15 @@
return AjaxResult.error();
}
+
+
+ @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
+ @ApiOperation (value = "鎬绘鍒犻櫎寮傚父椤圭洰鎺ュ彛")
+ public AjaxResult delzongjianyishengchakanyichangxiangmu(@RequestParam String id) {
+ ycxmService.removeById(id);
+ return AjaxResult.success();
+ }
+
private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
// asyncService.updateCheckType(tjNumber);
@@ -1738,13 +1760,17 @@
if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
if(!tjOrderDetail.getDeptId().equals("2")){
List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
- ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇","")
+ .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", ""),tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
+ ,tjOrderDetail.getProName().replaceAll("[锛�(][^锛�)]*[\u4e00-\u9fa5]+[^锛�)]*[锛�)]", "")
+ .replaceAll("[ 娴嬪畾妫�娴媇","").replaceAll("\\[.*?\\]", "")
,tjOrderDetail.getProResult());
+
+
if(null !=maps && !maps.isEmpty()){
tjOrderDetail.setAdvices(maps);
}
+
}else {
String[] split = tjOrderDetail.getProResult().split("銆倈,|锛�");
List<Map<String,Object>> mapList=new ArrayList<>();
@@ -1801,11 +1827,16 @@
String tjh = ycxms.get(0).getTjh();
if(StringUtils.isNotBlank(tjh)){
ycxmService.delOrderYcXmJyByTjh(tjh);
-
+// String szyssy="";
+// StringBuilder builders = new StringBuilder();
+// List<TjOrderYcxm> ycxmList=new ArrayList<>();
for (TjOrderYcxm ycxm : ycxms) {
ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
+// if(ycxm.getJcxm().contains("鑸掑紶鍘�")||ycxm.getJcxm().contains("鏀剁缉鍘�")){
+// builders.append(ycxm.getJcxm()).append(ycxm.getJcjg()).append(" ");
+// szyssy+=builders.toString();
+// }
}
-// List<TjOrderYcxm> collect = ycxms.stream().distinct().collect(Collectors.toList());
ycxmService.saveBatch(ycxms);
return AjaxResult.success();
}
--
Gitblit v1.8.0