From 936e2c79cd741472a6acfe28d730eb644b082cf7 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 21 十月 2024 14:22:19 +0800
Subject: [PATCH] 修改体检类型
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 47729ee..4ff949f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -147,6 +148,8 @@
private IdUtils idUtils;
@Autowired
private LtkjJybbzdService jybbzdService;
+ @Autowired
+ private LisJyflhbService lisJyflhbService;
@Override
@@ -474,7 +477,30 @@
String config = configService.selectConfigByKey("sfkqdyhis");
if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
- log.info("getJyFlHb ->{}",JSONUtil.toJsonStr(ajaxResult));
+ if (ajaxResult.get("code").toString().equals("200")){
+ String str = ajaxResult.get("data").toString();
+ str = str.replace("=", ":");
+ JSONArray array = JSONUtil.parseArray(str);
+ for (Object o : array) {
+ JSONObject object = (JSONObject) o;
+ LisJyflhb lisJyflhb = new LisJyflhb();
+ lisJyflhb.setHbhxm(object.getStr("hbhxm"));
+ lisJyflhb.setFlmc(object.getStr("flmc"));
+ lisJyflhb.setMc(object.getStr("mc"));
+ lisJyflhb.setFlbm(object.getStr("flbm"));
+ LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
+ LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
+ if (jyflhb == null) {
+ lisJyflhb.setId(IdUtil.getSnowflake().nextId());
+ lisJyflhbService.save(lisJyflhb);
+ }else {
+ lisJyflhb.setId(jyflhb.getId());
+ lisJyflhbService.updateById(lisJyflhb);
+ }
+ }
+ }
+
}
}
@@ -822,7 +848,7 @@
TjProject project = projectService.getById(item.getProId());
return project != null && project.getProParentId() == 0;
}).collect(Collectors.toList());
- addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
tjOrderDetails = new ArrayList<>();
ArrayList<TjProject> jianChaProjects = new ArrayList<>();
@@ -1000,7 +1026,7 @@
TjProject project = projectService.getById(item.getProId());
return project != null && project.getProParentId() == 0;
}).collect(Collectors.toList());
- addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
+// addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
}
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
@@ -1071,6 +1097,10 @@
ltkjJianchajianyanTreeService.save(tree);
}
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+
+ addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
+
}
}
--
Gitblit v1.8.0