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 +++++++++++++++++--------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java | 3 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java | 2 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java | 5 +++++
4 files changed, 27 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("鍚屾澶辫触璇烽噸璇�");
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
index 4cbc2a2..6768f37 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java
@@ -31,6 +31,9 @@
@Delete("DELETE FROM ltkj_hysqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
void deletedLtkjHysqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);
+ @Delete("DELETE FROM ltkj_hysqd WHERE tjh=#{tjh} AND xmid=#{xmid} ")
+ void deletedByTjhAndXmId(@Param("tjh") String tjh,@Param("xmid") String xmid);
+
@Select("SELECT * FROM ltkj_hysqd a WHERE a.tjh=#{tjh}")
List<LtkjHysqd> getLtkjHysqdByTjh(@Param("tjh") String tjh);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
index 09e791e..662a8d4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java
@@ -28,4 +28,6 @@
List<TjCustomer> getHyYcXmList(Date strTime, Date endTime);
int getHyYcXmCount(String cardId);
+
+ void deletedByTjhAndXmId(String tjh, String xmid);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
index 7d1ad35..7a90f41 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java
@@ -57,4 +57,9 @@
public int getHyYcXmCount(String cardId) {
return mapper.getHyYcXmCount(cardId);
}
+
+ @Override
+ public void deletedByTjhAndXmId(String tjh, String xmid) {
+ mapper.deletedByTjhAndXmId(tjh,xmid);
+ }
}
--
Gitblit v1.8.0