From 303a933ae58e2057f34693d5813e4128550d1081 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 03 一月 2025 20:58:25 +0800
Subject: [PATCH] zjh20250103
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 f55da7b..eb792a0 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
@@ -157,6 +157,11 @@
private ISysDictDataService sysDictDataService;
@Autowired
private TjSamplingMapper tjSamplingMapper;
+ @Autowired
+ private ISysConfigService sysConfigService;
+ @Resource
+ private ITjXdPictureService xdPictureService;
+
@Override
@@ -424,9 +429,12 @@
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null);
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(order.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
}
public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
+ String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix");
if (null != detailList && detailList1) {
String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
for (TjOrderDetail detail : detailList) {
@@ -435,7 +443,7 @@
TjProject project = projectService.getById(detail.getProId());
Long proParentId = project.getProParentId();
if (null != proParentId && proParentId == 0) {
- sampling.setJyxh(idUtils.generateLisID());
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project);
if (jyxmzd != null) {
sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
@@ -447,7 +455,7 @@
}
} else {
TjProject project1 = projectService.getById(proParentId);
- sampling.setJyxh(idUtils.generateLisID());
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project1);
if (jyxmzd != null) {
sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
@@ -765,6 +773,7 @@
}
public void addCaiYangDengJiByDiaoYongShiTu(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
+ String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix");
if (null != detailList && detailList1) {
Date date = new Date();
String format = DateUtil.format(date, "yyMMddHHmmssSSS");
@@ -775,13 +784,13 @@
Long proParentId = project.getProParentId();
String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType());
if (null != proParentId && proParentId == 0) {
- sampling.setJyxh(idUtils.generateLisID());
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
sampling.setSpecimenTypeCode(project.getSpecimenType());
sampling.setSpecimenType(dictLabel);
sampling.setJyxmdm(project.getProId().toString());
} else {
TjProject project1 = projectService.getById(proParentId);
- sampling.setJyxh(idUtils.generateLisID());
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
sampling.setSpecimenTypeCode(project1.getSpecimenType());
sampling.setSpecimenType(dictLabel);
@@ -852,6 +861,7 @@
String dept = configService.selectConfigByKey("request_default_dept");
String ysbm = configService.selectConfigByKey("request_default_ysbm");
String ysmc = configService.selectConfigByKey("request_default_ysmc");
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
@@ -884,7 +894,7 @@
}
}
if (stringList.size() > 1) {
- String id = tjSamplingService.mergeCaiYangApi(stringList);
+ String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix);
ids.add(id);
}else {
ids.add(stringList.get(0));
--
Gitblit v1.8.0