From 1ef5f262ec24d1a38a192903a4c0b707fb7f96e1 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 31 三月 2025 13:49:07 +0800
Subject: [PATCH] 手动同步调整
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 1757201..a80790b 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
@@ -126,9 +126,7 @@
return AjaxResult.error("浣撴鍙峰拰鍚嶅瓧涓嶈兘閮戒负绌�");
}
if (tjNum != null) {
- LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjOrder::getTjNumber,tjNum);
- TjOrder order = tjOrderService.getOne(wrapper);
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
mzh = order.getCardId();
LambdaQueryWrapper<TjCustomer> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(TjCustomer::getCusId,order.getUserId());
@@ -344,9 +342,15 @@
}
}
}
-
-
- hysqd.setTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
+ String tmh = tree.getSqdh()+"_"+tree.getHisXmdm();
+ String shys = "";
+ for (Object o : lis) {
+ cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) o;
+ if (StrUtil.isNotBlank(jsonObject.getStr("jyxh"))) tmh = jsonObject.getStr("jyxh");
+ if (StrUtil.isNotBlank(jsonObject.getStr("shys"))) shys = jsonObject.getStr("shys");
+ if (StrUtil.isNotBlank(tmh) && StrUtil.isNotBlank(shys) && StrUtil.isNotBlank(jsonObject.getStr("jyxh"))) break;
+ }
+ hysqd.setTmh(tmh);
if (StrUtil.isNotBlank(xmdm)) {
hysqd.setXmid(xmdm);
hysqd.setXmmc(project.getHisXmmc());
@@ -356,6 +360,7 @@
}
hysqd.setSqsj(format.format(tree.getCreateTime()));
hysqd.setJgsj(format.format(new Date()));
+ hysqd.setShrxm(shys);
// hysqd.setBbmc();
hysqdService.deletedByTjhAndXmId(hysqd.getTjh(),hysqd.getXmid());
hybgdService.deletedLtkjHybgdByTjhAndTmh(tree.getSqdh()+"_"+tree.getHisXmdm());
@@ -382,7 +387,8 @@
hybgd.setJysj(jsonObject.getStr("examinationDate"));
hybgd.setShsj(jsonObject.getStr("examinationDate"));
hybgd.setJyys(jsonObject.getStr("checkDoctorName"));
- hybgd.setShys(jsonObject.getStr("shys"));
+ hybgd.setShysmc(shys);
+ hybgd.setYcbz(jsonObject.getStr("ycbz"));
hybgdService.save(hybgd);
}
try {
--
Gitblit v1.8.0