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/system/TjOrderController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 56314af..2f3b4d1 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
@@ -57,6 +57,7 @@
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
+import com.ltkj.hosp.mapper.TjSamplingMapper;
import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
@@ -212,6 +213,10 @@
private HisPDFUtil hisPDFUtil;
@Value("${path.reportServer}")
private String urlValue;
+ @Autowired
+ private ITjSamplingService samplingService;
+ @Autowired
+ private TjSamplingMapper tjSamplingMapper;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -1082,12 +1087,15 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
-// if (isUseLisAndPacsRegister(tjOrder)) {
-// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"),tjOrder,sysUser,result);
-// }else {
-// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
-// }
- hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+ if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ }else {
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ }
+// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
return AjaxResult.success(tjNumber);
} else {
tjCustomer.setCardId(tjOrder.getTjNumber());
@@ -2550,6 +2558,7 @@
customer.setCardId("0");
tjCustomerService.updateById(customer);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ tjSamplingMapper.deleteByTjNumAndCusId(tjNum,order.getUserId());
if (configByKey.equals("Y")) {
HashMap<String, Object> hisRequestParams = new HashMap<>();
@@ -2577,7 +2586,6 @@
}
}
- return AjaxResult.success("鎾ら攢鎴愬姛!!!");
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
}
@@ -2822,6 +2830,7 @@
HashMap<String, Object> hisRequestParams = new HashMap<>();
hisRequestParams.put("patientId", order.getCardId());
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ log.info("queryPay ->{}",JSONUtil.toJsonStr(queryPay));
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
log.info("data鐨勬暟鎹槸" + JSONUtil.toJsonStr(data));
@@ -2855,7 +2864,7 @@
}
}
try {
- extracted(dto);
+ extracted(dto,order);
} catch (Exception e) {
log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
@@ -2865,8 +2874,8 @@
return AjaxResult.error();
}
- // @Transactional(propagation =Propagation.REQUIRES_NEW)
- public void extracted(TjProBlDto dto) {
+// @Transactional(propagation =Propagation.REQUIRES_NEW)
+ public void extracted(TjProBlDto dto,TjOrder order) {
for (String bldh : dto.getBldhs()) {
remarkService.deleteTjOrderDetailByjxbz(bldh);
tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
@@ -2874,6 +2883,7 @@
transitionService.deleteTjOrderDetailByjxbz(bldh);
blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
}
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(),order.getUserId(),dto.getBldhs());
}
--
Gitblit v1.8.0