From 92f6a9cabdc277e15571353d9ace6ea5abdd335f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 28 三月 2025 18:00:44 +0800
Subject: [PATCH] 手动同步调整
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 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 6ee8ae2..1757201 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
@@ -313,7 +313,7 @@
LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TjOrder::getTjNumber,tjNum);
TjOrder order = tjOrderService.getOne(wrapper);
- hysqd.setTjh(order.getTjNumber());
+ hysqd.setTjh(order.getCardId());
String mzh = order.getCardId();
LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
@@ -347,19 +347,25 @@
hysqd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
- hysqd.setXmid(xmdm);
- hysqd.setXmmc(project.getHisXmbm());
+ if (StrUtil.isNotBlank(xmdm)) {
+ hysqd.setXmid(xmdm);
+ hysqd.setXmmc(project.getHisXmmc());
+ }else {
+ hysqd.setXmid(String.valueOf(project.getProId()));
+ hysqd.setXmmc(project.getProName());
+ }
hysqd.setSqsj(format.format(tree.getCreateTime()));
hysqd.setJgsj(format.format(new Date()));
// hysqd.setBbmc();
- boolean save = hysqdService.save(hysqd);
- boolean save2 = true;
+ hysqdService.deletedByTjhAndXmId(hysqd.getTjh(),hysqd.getXmid());
+ hybgdService.deletedLtkjHybgdByTjhAndTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+ hysqdService.save(hysqd);
for (Object object : lis) {
cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) object;
LtkjHybgd hybgd = new LtkjHybgd();
hybgd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
hybgd.setJcxmid(jsonObject.getStr("jcxmid"));
- hybgd.setJcxm(jsonObject.getStr("checkParts"));
+ hybgd.setJcxm(jsonObject.getStr("proName"));
hybgd.setJyjg(jsonObject.getStr("proResult"));
hybgd.setJgdw(jsonObject.getStr("company"));
String tjStandardGtValue = jsonObject.getStr("tjStandardGtValue");
@@ -377,21 +383,12 @@
hybgd.setShsj(jsonObject.getStr("examinationDate"));
hybgd.setJyys(jsonObject.getStr("checkDoctorName"));
hybgd.setShys(jsonObject.getStr("shys"));
- boolean save1 = hybgdService.save(hybgd);
- if (!save1) {
- save2 = false;
- break;
- }
+ hybgdService.save(hybgd);
}
- if (save && save2){
- try {
- testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
- }catch (Exception e){
- log.error(String.valueOf(e));
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
- }
- } else {
+ try {
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ }catch (Exception e){
+ log.error(String.valueOf(e));
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鍚屾澶辫触璇烽噸璇�");
}
--
Gitblit v1.8.0