From 1c4935c13c44f35bc59e77cff6a66e3131a35d94 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 27 二月 2025 17:56:21 +0800
Subject: [PATCH] 修改同步
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
index f8b2008..719cc7e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java
@@ -10,6 +10,7 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.LtkjJianchajianyanTree;
+import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.hisDto.*;
@@ -59,6 +60,8 @@
private LtkjHysqdService hysqdService;
@Autowired
private LtkjHybgdService hybgdService;
+ @Autowired
+ private ITjCustomerService tjCustomerService;
/**
* 鑾峰彇pacs妫�鏌ユ暟鎹�
@@ -81,6 +84,10 @@
wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
mzh = order.getCardId();
+ LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+ name = tjCustomer.getCusName();
}
List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
if (jcList.isEmpty()){
@@ -123,6 +130,10 @@
wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
mzh = order.getCardId();
+ LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+ name = tjCustomer.getCusName();
}
List<Map<String, Object>> jcList = testMapper.getPacsJcList(name, mzh, start, end);
return AjaxResult.success(jcList);
@@ -138,7 +149,7 @@
*/
@PostMapping("/lis/getList")
public AjaxResult getLisList(@RequestBody String json) {
- log.info("lis鎺ュ彛鍙傛暟->{}",JSONUtil.toJsonStr(json));
+// log.info("lis鎺ュ彛鍙傛暟->{}",JSONUtil.toJsonStr(json));
cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(json);
String tjNum = StrUtil.isBlank(parseObj.getStr("tjNum")) ? null : parseObj.getStr("tjNum");
String name = StrUtil.isBlank(parseObj.getStr("name")) ? null : parseObj.getStr("name");
@@ -153,6 +164,10 @@
wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
mzh = order.getCardId();
+ LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjCustomer::getCusId,order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper1);
+ name = tjCustomer.getCusName();
}
List<Map<String, Object>> jcList = testMapper.getLisJyList(name, mzh, start, end);
return AjaxResult.success(jcList);
@@ -164,7 +179,9 @@
public AjaxResult getTjList(@RequestParam("code")String code){
// log.info("tjList鎺ュ彛鍙傛暟->{}",code);
LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(TjOrder::getCardId,code);
+ queryWrapper.eq(TjOrder::getCardId, code)
+ .or()
+ .eq(TjOrder::getTjNumber, code);
TjOrder order = tjOrderService.getOne(queryWrapper);
if (order == null){
return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
@@ -179,7 +196,9 @@
public AjaxResult getJyTjList(@RequestParam("code")String code){
// log.info("tjList鎺ュ彛鍙傛暟->{}",code);
LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(TjOrder::getCardId,code);
+ queryWrapper.eq(TjOrder::getCardId,code)
+ .or()
+ .eq(TjOrder::getTjNumber, code);
TjOrder order = tjOrderService.getOne(queryWrapper);
if (order == null){
return AjaxResult.error("闂ㄨ瘖鍙�:"+code+"鍦ㄤ綋妫�绯荤粺涓笉瀛樺湪");
@@ -210,11 +229,16 @@
cn.hutool.json.JSONArray lis = parseObj.getJSONArray("lis");
cn.hutool.json.JSONObject tj = parseObj.getJSONObject("tj");
if (pacs != null && !pacs.isEmpty()){
+ String tjNum = pacs.getStr("tjnum");
+ LambdaQueryWrapper<TjOrder> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjOrder::getTjNumber,tjNum);
+ TjOrder order = tjOrderService.getOne(wrapper1);
+
LtkjExamJcsqd ltkjExamJcsqd = new LtkjExamJcsqd();
- ltkjExamJcsqd.setTjh(pacs.getStr("mzh"));
+ ltkjExamJcsqd.setTjh(order.getCardId());
LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(LtkjJianchajianyanTree::getCardId, pacs.getStr("mzh"));
+ queryWrapper.eq(LtkjJianchajianyanTree::getCardId, order.getCardId());
String xmdm = projectService.getById(tj.getStr("proId")).getHisXmbm();
queryWrapper.eq(LtkjJianchajianyanTree::getType,"妫�鏌�");
queryWrapper.eq(LtkjJianchajianyanTree::getHisXmdm,xmdm);
@@ -255,9 +279,6 @@
ltkjExamJcbgd.setJcbw(ltkjExamJcsqd.getJcxmmc());
boolean save2 = ltkjExamJcbgdService.save(ltkjExamJcbgd);
if (save1 && save2) {
- LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getCardId, ltkjExamJcbgd.getTjh());
- TjOrder order = tjOrderService.getOne(wrapper);
try {
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
}catch (Exception e){
@@ -272,12 +293,13 @@
return AjaxResult.success();
}else {
cn.hutool.json.JSONObject entries = (cn.hutool.json.JSONObject) lis.get(0);
- String mzh = entries.getStr("mzh");
+ String tjNum = entries.getStr("tjNum");
LtkjHysqd hysqd = new LtkjHysqd();
LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getCardId,mzh);
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
hysqd.setTjh(order.getTjNumber());
+ String mzh = order.getCardId();
LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(LtkjJianchajianyanTree::getCardId, mzh);
--
Gitblit v1.8.0