From df62988da54d44526b0ea768b64a6e176c00e737 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 04 十二月 2023 14:52:31 +0800
Subject: [PATCH] 111

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 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 a6cf3b9..e485e43 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
@@ -25,6 +25,7 @@
 import com.ltkj.common.core.redis.RedisCache;
 import com.ltkj.common.utils.SecurityUtils;
 import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.config.UserHoder;
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.service.*;
 import com.ltkj.hosp.vodomain.BingZhongVO;
@@ -93,8 +94,6 @@
     @Resource
     private ITjOrderRemarkService remarkService;
     @Resource
-    private ITjTeamSelectRecordService selectRecordService;
-    @Resource
     private TjAsyncService asyncService;
     @Resource
     private ISysUserService userService;
@@ -131,6 +130,9 @@
 
     @Autowired
     private ITjAskMedicalHistoryService tjAskMedicalHistoryService;
+
+    @Autowired
+    private ITjReportGetAddressService tjReportGetAddressService;
 
 
     /**
@@ -432,6 +434,7 @@
                     LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
                     wq.isNotNull(TjOrder::getReportTime);
                     wq.eq(TjOrder::getUserId, customer.getCusId());
+                    wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
                     list.addAll(tjOrderService.list(wq));
                 }
                 List<TjOrder> collect = null;
@@ -483,6 +486,7 @@
         Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
         wq.isNotNull(TjOrder::getReportTime);
+        wq.eq(TjOrder::getHeshouStatus, 1);  //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
         if (null != bgbeginTime && null != bgendTime) {
             wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(bgbeginTime), DateUtil.endOfDay(bgendTime));
         }
@@ -807,8 +811,11 @@
             if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
             if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
             if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
-            if (null != tjReservation.getGroupingId()) tjOrder.setGroupId(tjReservation.getGroupingId());
-            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
+            if (null != tjReservation.getGroupingId()){
+                tjOrder.setGroupId(tjReservation.getGroupingId());
+                tjOrder.setFirmDeptId(tjReservation.getPacId());
+            }
+//            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
             tjReservation.setIsExpire(1);
             tjReservationService.updateById(tjReservation);
             if (null != tjReservation.getTeamNo()) {
@@ -838,11 +845,18 @@
         if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
             tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
         }
-
         //鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
         if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
         tjOrder.setStatus(TjConstants.TJ_BEGIN);
         if (tjOrderService.save(tjOrder)) {
+            //淇濆瓨鏀惰揣鍦板潃
+            if ("2".equals(tjOrder.getGetType())){
+                final TjReportGetAddress address = tjOrder.getAddAddress();
+                if (address!=null){
+                    address.setTjNumber(tjNumber);
+                    tjReportGetAddressService.save(address);
+                }
+            }
             Long cusNumber = tjCustomer.getCusNumber();
             cusNumber += 1;
             tjCustomer.setCusNumber(cusNumber);
@@ -891,7 +905,6 @@
 
             //鍥綋
             if ("1".equals(tjOrder.getTjType())) {
-                tjOrder.setFirmDeptId(tjOrder.getPacId());
                 asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
             }
 
@@ -1613,4 +1626,21 @@
         System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
     }
 
+
+    @PostMapping("/heXiaoByIds/{orderIds}")
+    @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
+    @Transactional
+    public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
+        for (String orderId : orderIds) {
+            final TjOrder byId = tjOrderService.getById(orderId);
+            byId.setHeshouStatus(1);
+            byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
+            byId.setHeshouTime(new DateTime());
+            final boolean b = tjOrderService.updateById(byId);
+            if (!b){
+                return AjaxResult.error("鏍告敹澶辫触");
+            }
+        }
+        return AjaxResult.success("鏍告敹鎴愬姛");
+    }
 }

--
Gitblit v1.8.0