From 8ffc92e731968b541886aa5ac9b7abd4e9249a44 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 20 九月 2024 18:06:40 +0800
Subject: [PATCH] 增加对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index eb79a5f..13f26ab 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -20,7 +20,9 @@
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.RandomUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -38,6 +40,8 @@
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
+import com.ltkj.common.utils.AgeResult;
+import com.ltkj.common.utils.DateUtils;
import com.ltkj.common.utils.PDFDocumentUtil;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
@@ -50,6 +54,7 @@
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
+import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
@@ -71,10 +76,13 @@
import com.ltkj.web.controller.his.HisApiMethod;
import com.ltkj.web.controller.his.HisApiMethodService;
import com.ltkj.web.controller.his.HisMzJysqController;
+import com.ltkj.web.controller.lis.LisApiMethod;
+import com.ltkj.web.controller.pacs.PacsApiMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -198,6 +206,12 @@
private TjProBlService blService;
@Autowired
private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+ @Autowired
+ private PacsApiMethodService pacsApiMethodService;
+ @Autowired
+ private ITbTransitionService tbTransitionService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
@Autowired
private TjCfService cfService;
@@ -893,7 +907,7 @@
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
-
+ TjFlowingWater tjFlowingWater = new TjFlowingWater();
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -958,6 +972,9 @@
tjOrder.setFinishTime(new Date());
tjOrder.setCheckStatus(1);
tjOrder.setStatus(TjConstants.TJ_WAIT);
+ tjFlowingWater.setPayStasus(1L);
+ }else {
+ tjFlowingWater.setPayStasus(0L);
}
if (tjOrderService.save(tjOrder)) {
@@ -973,8 +990,7 @@
cusNumber += 1;
tjCustomer.setCusNumber(cusNumber);
BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
- TjFlowingWater tjFlowingWater = new TjFlowingWater();
- tjFlowingWater.setPayStasus(0L);
+
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjFlowingWater.setPayStasus(3L);
@@ -1062,7 +1078,17 @@
//asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
- hisApiMethod.tijianshenqing(tjCustomer,DateUtil.format(date1,"yyyy-MM-dd HH:mm:ss"),tjOrder.getCardId());
+ // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+ String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
+ String[] split = useLisAndPacsRegisterDictTeam.split(",");
+ List<String> list = Arrays.asList(split);
+ if (list.contains(tjOrder.getTjType())) {
+ List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
+ pacsApiMethodService.save(tjOrder,tjCustomer,detailList);
+ lisApiMethod.save(tjOrder,tjCustomer,detailList);
+ }else {
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ }
return AjaxResult.success(tjNumber);
} else {
--
Gitblit v1.8.0