From 9a7ee34013ff0a0eb9a65d76ced42b4f13f3e4d4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 13 三月 2025 17:39:22 +0800
Subject: [PATCH] 从lis、pacs视图查询增加携带院区 修改签到登记价格问题

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   99 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 79 insertions(+), 20 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 6461594..f4d4bc9 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
@@ -1085,7 +1085,11 @@
                 tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
                 return result;
             }
-        } finally {
+        }catch (Exception e){
+            log.error(String.valueOf(e),e.getMessage());
+            e.printStackTrace();
+        }
+        finally {
             lock.unlock();
         }
         return AjaxResult.error();
@@ -1347,6 +1351,7 @@
             // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
 
             if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+                log.info("绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
                 // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
                 tjFlowingWater.setPayStasus(1L);
                 newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
@@ -1356,6 +1361,7 @@
                 List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
                 xdPictureService.saveBatch(xdPictureList);
                 List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+                log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
                 addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
                 return AjaxResult.success(tjNumber);
             } else {
@@ -1396,6 +1402,7 @@
             wrapper.gt(TbTransition::getNowPrice, 0);
 
             List<TbTransition> list = tbTransitionService.list(wrapper);
+            BigDecimal zongjia = new BigDecimal("0.0");
             for (TbTransition transition : list) {
                 LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
                 wrapper1.eq(TjProject::getProId, transition.getProId());
@@ -1406,7 +1413,8 @@
                 SysDept dept = sysDeptService.getOne(wrapper2);
 
                 JSONObject obj = JSONUtil.createObj();
-                Integer sl = project.getSl();
+//                Integer sl = project.getSl();
+                int sl = 1;
                 BigDecimal danjia = transition.getNowPrice();
                 BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
                 obj.putOpt("danJia", danjia);
@@ -1417,8 +1425,10 @@
                 obj.putOpt("shouFeiXmId", project.getHisXmbm());
                 obj.putOpt("shouFeiXmMc", project.getHisXmmc());
                 array.add(obj);
+                zongjia = zongjia.add(allPrice);
             }
             map.put("feiYongInfoList", array);
+            log.info("璋冪敤His鎺ュ彛鍓� 鏀惰垂鎬讳环:{}", zongjia.toString());
 
             String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
             JSONObject object = JSONUtil.parseObj(post);
@@ -1522,6 +1532,28 @@
         } else {
             tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
         }
+    }
+
+
+
+    @GetMapping("/addCaiYangDengJi")
+    @ApiOperation(value = "鎵嬪姩娣诲姞閲囨牱璁板綍鎺ュ彛")
+    public AjaxResult addCaiYangDengJi(@RequestParam("tjNum") String tjNum){
+
+        try {
+            TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+            if(null !=order){
+                Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+                SysUser sysUser = userService.getById(userId);
+                List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+                log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
+                addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser, null);
+            }
+        } catch (NumberFormatException e) {
+            log.error(String.valueOf(e));
+        }
+
+        return AjaxResult.success();
     }
 
 
@@ -1853,9 +1885,9 @@
                 tjOrder.setTjType("2");
             }
 
-        if (StringUtil.isBlank(tjOrder.getFirmId())) {
-            tjOrder.setFirmId("0");
-        }
+            if (StringUtil.isBlank(tjOrder.getFirmId())) {
+                tjOrder.setFirmId("0");
+            }
 //
 //            tjReservation.setIsExpire(1);
 //            tjReservationService.updateById(tjReservation);
@@ -3920,7 +3952,9 @@
     public AjaxResult updateTransitionnewPrice(@RequestBody List<UpdateTransitionnewPriceDto> dtos) {
 
         if (null != dtos && !dtos.isEmpty()) {
+            int index = 0;
             for (UpdateTransitionnewPriceDto dto : dtos) {
+                index++;
                 LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
                 wq.eq(TbTransition::getCusId, dto.getCusIdCard());
                 wq.eq(TbTransition::getParentProId, dto.getParentProId());
@@ -3931,22 +3965,47 @@
                 log.info("鎶樻墸涓�: " + new BigDecimal(dto.getDiscount()));
                 if (null != list && !list.isEmpty()) {
                     BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
-                    for (TbTransition transition : list) {
-                        BigDecimal ordPrice = transition.getOrdPrice();
-                        BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
-                        log.info("鍚庣璁$畻鐨勯噾棰�: " + multiply);
-                        transition.setNowPrice(multiply);
-                        transition.setDiscount(new BigDecimal(dto.getDiscount()));
-                        transitionService.updateById(transition);
-                    }
-                    if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) {
-                        List<TbTransition> transitionList = list.stream().filter(a ->
-                                transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
-                        if (!transitionList.isEmpty()) {
-                            TbTransition tbTransition = transitionList.get(0);
-                            tbTransition.setNowPrice(dxzj);
-                            transitionService.updateById(tbTransition);
+                    log.info("dxzj:{}",dxzj.toString());
+                    if (index == dtos.size()){
+                        BigDecimal yhj = dto.getYhj();
+                        log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
+                        BigDecimal cj = yhj.subtract(dxzj);
+                        log.info("璁$畻鐨勫樊浠凤細{}",cj.toString());
+                        int index1 = 0;
+                        for (TbTransition transition : list) {
+                            BigDecimal ordPrice = transition.getOrdPrice();
+                            BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+                            if (index1 == 0){
+                                log.info("淇敼灏忛」 {}{} 鍘熸湰浠锋牸:{}",transition.getProId(),transition.getProName(),multiply.toString());
+                                multiply = multiply.add(cj);
+                                log.info("澧炲姞宸环鍚庯細{}",multiply.toString());
+                            }
+                            index1++;
+                            log.info("鍚庣璁$畻鐨勯噾棰�: " + multiply.toString());
+//                        log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+                            transition.setNowPrice(multiply);
+                            transition.setDiscount(new BigDecimal(dto.getDiscount()));
+                            transitionService.updateById(transition);
                         }
+                    }else {
+                        for (TbTransition transition : list) {
+                            BigDecimal ordPrice = transition.getOrdPrice();
+                            BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+                            log.info("鍚庣璁$畻鐨勯噾棰�: " + multiply.toString());
+//                        log.info("鍓嶇浼犻�掔殑閲戦: " + dto.getYhj());
+                            transition.setNowPrice(multiply);
+                            transition.setDiscount(new BigDecimal(dto.getDiscount()));
+                            transitionService.updateById(transition);
+                        }
+//                        if (null != dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO) >= 0) {
+//                            List<TbTransition> transitionList = list.stream().filter(a ->
+//                                    transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
+//                            if (!transitionList.isEmpty()) {
+//                                TbTransition tbTransition = transitionList.get(0);
+//                                tbTransition.setNowPrice(dxzj);
+//                                transitionService.updateById(tbTransition);
+//                            }
+//                        }
                     }
                 }
             }

--
Gitblit v1.8.0