From 9199522e90b4f50dc0444dc90cad61366efd8db7 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 03 一月 2025 21:33:46 +0800
Subject: [PATCH] 20250103-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 93c2b26..63c41d8 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
@@ -232,6 +232,8 @@
private ISysDictDataService sysDictDataService;
@Autowired
private TjFlowingWaterHisService tjFlowingWaterHisService;
+ @Resource
+ private ITjXdPictureService xdPictureService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -1179,7 +1181,8 @@
// transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
//淇敼涓存椂琛ㄤ綋妫�鍙�
transitionService.updateTbTransitionTjNumByCusId(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
- if(subtract.compareTo(BigDecimal.ZERO)>0){
+ //琛ュ樊浠�
+ /* if(subtract.compareTo(BigDecimal.ZERO)>0){
tjFlowingWater.setPaidIn(paidIn.add(subtract));
TbTransition onwTbTransition = transitionService.getOnwTbTransition(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
if(null !=onwTbTransition){
@@ -1188,7 +1191,7 @@
onwTbTransition.setNowPrice(onwTbTransition.getNowPrice().add(subtract));
transitionService.updateById(onwTbTransition);
}
- }
+ }*/
if (tjFlowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
@@ -1230,6 +1233,8 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
} else {
@@ -1341,13 +1346,15 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
return AjaxResult.success(tjNumber);
}else {
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
- addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
}
String s = configService.selectConfigByKey("is_request_common_his_api");
@@ -1426,6 +1433,7 @@
}
public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
if (null != detailList && detailList1) {
Date date = new Date();
String format = DateUtil.format(date, "yyMMddHHmmssSSS");
@@ -1436,13 +1444,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);
@@ -2694,6 +2702,8 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
}
}
if (tjFlowingWater.getPayStasus() == 1L) {
@@ -2705,6 +2715,8 @@
tjFlowingWaterService.updateById(tjFlowingWater);
remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
}
}
@@ -3067,7 +3079,7 @@
TjCustomer customer = tjCustomerService.getById(order.getUserId());
customer.setCardId("0");
tjCustomerService.updateById(customer);
-
+ xdPictureService.deleteTjXdPictureBytjNum(tjNum);
tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
}
@@ -3120,11 +3132,11 @@
if (null != reservationTime)
wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime), DateUtil.endOfDay(reservationTime));
List<TjReservation> reservationList = tjReservationService.list(wq);
- if (null != reservationList && reservationList.size() > 0) {
+ if (null != reservationList && !reservationList.isEmpty()) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.in(TjOrder::getReservationId, reservationList.stream().map(TjReservation::getId).collect(Collectors.toList()));
List<TjOrder> orderList = tjOrderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
LambdaQueryWrapper<TjReservation> wq3 = new LambdaQueryWrapper<>();
wq3.in(TjReservation::getId, orderList.stream().map(TjOrder::getReservationId).collect(Collectors.toList()));
// wq3.eq(TjReservation::getTeamNo,reservationList.get(0).getTeamNo());
@@ -3141,11 +3153,11 @@
@ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
@Transactional
public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
- if (null != reservationIds && reservationIds.size() > 0) {
+ if (null != reservationIds && !reservationIds.isEmpty()) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.in(TjOrder::getReservationId, reservationIds);
List<TjOrder> orderList = tjOrderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
for (TjOrder order : orderList) {
// TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -3303,12 +3315,12 @@
LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>();
wq.eq(TjProBl::getTjh, tjNum);
List<TjProBl> blList = blService.list(wq);
- if (null != blList && blList.size() > 0) {
+ if (null != blList && !blList.isEmpty()) {
for (TjProBl bl : blList) {
LambdaQueryWrapper<TjOrderRemark> wqr = new LambdaQueryWrapper<>();
wqr.eq(TjOrderRemark::getJxbz, bl.getBldh());
List<TjOrderRemark> remarkList = remarkService.list(wqr);
- if (null != remarkList && remarkList.size() > 0) {
+ if (null != remarkList && !remarkList.isEmpty()) {
List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> wqp = new LambdaQueryWrapper<>();
wqp.in(TjProject::getProId, collect);
--
Gitblit v1.8.0