From 53d149f491dba554ee035599059a1bf65ea92df2 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 12 二月 2025 17:36:13 +0800
Subject: [PATCH] 增加手动同步lis接口
---
ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
index e0e0ae6..ea472c0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -79,6 +79,9 @@
@Deprecated
public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TbTransition> detailList){
if (detailList != null && !detailList.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
@@ -94,7 +97,7 @@
LtkjJyxmzd jyxmzd = getJyxmzd(project);
if (jyxmzd != null) {
LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
- String jyxh = idUtils.generateLisID();
+ String jyxh = idUtils.generateLisID(lis_tmh_prefix);
lisSaveSqdxxDto.setJyxh(jyxh);
lisSaveSqdxxDto.setBah(tjOrder.getCardId());
lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName());
@@ -112,8 +115,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -160,6 +163,7 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�楠�");
+ tree.setService("lis");
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -192,6 +196,8 @@
}
public Boolean save(TjSampling sampling,TjOrder tjOrder,TjCustomer tjCustomer){
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
AtomicInteger xh = new AtomicInteger();
LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
// String jyxh = idUtils.generateLisID();
@@ -212,12 +218,17 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
- BigDecimal allPrice = tbTransitionMapper.getLisPriceByTjNumAndParentProId(tjOrder.getTjNumber(), sampling.getProId());
+ BigDecimal allPrice;
+ if (sampling.getProId().contains(",")){
+ allPrice = tbTransitionMapper.getLisPriceByTjNumAndInParentProId(tjOrder.getTjNumber(), Arrays.asList(sampling.getProId().split(",")));
+ }else {
+ allPrice = tbTransitionMapper.getLisPriceByTjNumAndParentProId(tjOrder.getTjNumber(), sampling.getProId());
+ }
lisSaveSqdxxDto.setFyje(allPrice.toString());
lisSaveSqdxxDto.setYbbm(sampling.getSpecimenTypeCode());
@@ -285,6 +296,7 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�楠�");
+ tree.setService("lis");
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -319,6 +331,9 @@
// List<TjProject> projects = projectService.list(wq);
if (projects != null && !projects.isEmpty()) {
+ String dept = configService.selectConfigByKey("request_default_dept");
+ String ysbm = configService.selectConfigByKey("request_default_ysbm");
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
// 鏍规嵁project琛ㄧ殑his_xmbm鏌ョ粍鍚堝叧鑱旇〃 ltkj_jfzhgljyxmzd 鏍规嵁瀛楁`zhxmdm`
// - 鏌ュ埌 浣跨敤瀛楁`jyxmdm`鏌ユ楠岄」鐩瓧鍏歌〃 ltkj_jyxmzd 鏍规嵁瀛楁`jyxmdm`
// - 鏈煡鍒� 鏌ラ」鐩叧鑱旇〃ltkj_jfxmgljyxmzd 鏍规嵁瀛楁`xmdm`
@@ -329,7 +344,7 @@
LtkjJyxmzd jyxmzd = getJyxmzd(project);
if (jyxmzd != null) {
LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
- String jyxh = idUtils.generateLisID();
+ String jyxh = idUtils.generateLisID(lis_tmh_prefix);
lisSaveSqdxxDto.setJyxh(jyxh);
lisSaveSqdxxDto.setBah(tjOrder.getCardId());
lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName());
@@ -347,8 +362,8 @@
lisSaveSqdxxDto.setCyrq("");
lisSaveSqdxxDto.setLczd("");
lisSaveSqdxxDto.setBz("");
- lisSaveSqdxxDto.setKsbm("0101");
- lisSaveSqdxxDto.setSqys("00029");
+ lisSaveSqdxxDto.setKsbm(dept);
+ lisSaveSqdxxDto.setSqys(ysbm);
lisSaveSqdxxDto.setKfbz("1");
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -395,6 +410,7 @@
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�楠�");
+ tree.setService("lis");
tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
@@ -473,7 +489,7 @@
public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
try {
String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
- String[] split = useLisAndPacsRegisterDictTeam.split(",");
+ String[] split = useLisAndPacsRegisterDictTeam.split(",|锛寍銆倈锛殀:");
List<String> list = Arrays.asList(split);
return list.contains(tjOrder.getTjType());
} catch (Exception e) {
--
Gitblit v1.8.0