From dcdcf7bf4708d409554b89096eb688557ab39342 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期六, 12 十月 2024 16:55:58 +0800
Subject: [PATCH] 签到登记修改
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 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 cf4d7d8..b872d26 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
@@ -78,6 +78,7 @@
import com.ltkj.web.controller.his.*;
import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
+import com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -211,6 +212,8 @@
private HisPDFUtil hisPDFUtil;
@Value("${path.reportServer}")
private String urlValue;
+ @Autowired
+ private TjSysAsyncServiceImpl tjSysAsyncService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -1082,20 +1085,24 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
// 鏌ヨ 瀵规帴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())) {
+// if (isUseLisAndPacsRegister(tjOrder)) {
// List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
-// try {
-// lisApiMethod.save(tjOrder,tjCustomer,detailList);
-// pacsApiMethodService.save(tjOrder,tjCustomer,detailList);
-// }catch (Exception e){
-// String jyxh = "";
-// String cardId = "";
-// String cusName = "";
-// lisApiMethod.cancel(jyxh,cardId,cusName);
+//// lisApiMethod.save(tjOrder,tjCustomer,detailList);
+// if(!pacsApiMethodService.save(tjOrder,tjCustomer,detailList)){
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// Object jzh = result.get("jzh");
+// if (null != jzh && null != jzh.toString()) {
+// hisApiMethod.ZfHisApiMethod(jzh.toString());
+// }
+// log.error("pacs鐢宠澶辫触 璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
+// return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
// }
+// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
+// wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
+// wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
+// wq2.eq(TjOrderDetail::getIsSampling, 0);
+// List<TjOrderDetail> detailList1 = tjOrderDetailService.list(wq2);
+// tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList.isEmpty(), order, sysUser);
// }else {
// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
// }
@@ -1129,6 +1136,20 @@
return AjaxResult.error();
}
+ /**
+ * 鏍规嵁浣撴绫诲瀷鍒ゆ柇鏄惁闇�瑕佺洿鎺ヤ粠Lis銆乸acs鐩存帴鐢宠
+ */
+ public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
+ try {
+ String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
+ String[] split = useLisAndPacsRegisterDictTeam.split(",");
+ List<String> list = Arrays.asList(split);
+ return list.contains(tjOrder.getTjType());
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
--
Gitblit v1.8.0