From e3f6f42c3056a8fac0308ec93b3e192c82cfc3dd Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 23 十月 2024 11:49:43 +0800
Subject: [PATCH] 团体票不走his请求、增加团体票收费状态
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 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 cb85d44..001aaaf 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) {
@@ -937,9 +942,9 @@
// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
- if (null != tjReservation.getTeamNo()) {
+ if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
tjOrder.setTjType("1");
- } else {
+ } else if (tjOrder.getTjType().equals("2")){
tjOrder.setTjType("2");
}
}
@@ -1082,15 +1087,18 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
-// if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ 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());
+ tjFlowingWater.setPayStasus(1L);
+ 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;
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ }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());
@@ -1577,7 +1585,7 @@
if (null != tjCustomer) {
cardId = tjCustomer.getCardId();
}
- if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
+ if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
transitionService.deletedTbTransitionByCusId(cusId);
if (redisCache.hasKey(cardId + cusId)) {
redisCache.deleteObject(cardId + cusId);
@@ -2553,6 +2561,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<>();
@@ -2580,7 +2589,6 @@
}
}
- return AjaxResult.success("鎾ら攢鎴愬姛!!!");
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
}
@@ -2825,6 +2833,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));
@@ -2858,7 +2867,7 @@
}
}
try {
- extracted(dto);
+ extracted(dto,order);
} catch (Exception e) {
log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
@@ -2868,8 +2877,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);
@@ -2877,6 +2886,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