From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java |   72 +++++++++++++++++++++++++++++++++++-
 1 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
index c03641c..64bff39 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java
@@ -3,12 +3,24 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sinata.common.entity.PageDTO;
 import com.sinata.system.domain.MwCheckoutRecord;
+import com.sinata.system.domain.dto.CollectTotalUpDto;
 import com.sinata.system.domain.query.CheckoutRecordQuery;
+import com.sinata.system.domain.query.DisposalReportQuery;
 import com.sinata.system.domain.query.MwCheckoutRecordItemQuery;
 import com.sinata.system.domain.query.MwTransitRecordQuery;
+import com.sinata.system.domain.query.TransformQuery;
 import com.sinata.system.domain.vo.MwCheckoutRecordVO;
+import com.sinata.system.domain.vo.MwCollectRecordVO;
 import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
+import com.sinata.system.domain.vo.MwTransitCarWarningVO;
 import com.sinata.system.domain.vo.MwTransitRecordVO;
+import com.sinata.system.domain.vo.TransformVO;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.List;
 
 /**
  * <p>
@@ -30,10 +42,10 @@
     /**
      * 转运记录详情
      *
-     * @param departmentId
+     * @param id
      * @return
      */
-    MwCheckoutRecordVO hospitalDetail(Long departmentId);
+    MwCheckoutRecordVO hospitalDetail(Long id);
 
     /**
      * 转运记录医废详情分页列表
@@ -50,4 +62,60 @@
      * @return
      */
     PageDTO<MwTransitRecordVO> transitPageList(MwTransitRecordQuery query);
+
+    /**
+     * 运输记录详情
+     *
+     * @param id
+     * @return
+     */
+    MwTransitRecordVO transitDetail(Long id);
+
+    /**
+     * 运输记录详情分页列表
+     *
+     * @param query
+     * @return
+     */
+    PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(MwTransitRecordQuery query);
+
+    /**
+     * 转运记录导出
+     *
+     * @param query
+     * @param response
+     */
+    void checkoutRecordExport(CheckoutRecordQuery query, HttpServletResponse response) throws IOException;
+
+    /**
+     * 转移联单数据
+     *
+     * @param query
+     * @param treeCode
+     * @return
+     */
+    List<TransformVO> getCheckoutRecordList(TransformQuery query, String treeCode);
+
+    /**
+     * 监管报表医疗废物转移列表
+     *
+     * @param query
+     * @return
+     */
+    List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);
+
+    List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId);
+    List<CollectTotalUpDto> totalUp4(Long departmentId);
+    List<CollectTotalUpDto> totalUp2(LocalDate date1, Long departmentId);
+    List<CollectTotalUpDto> totalUp5(Long departmentId);
+    List<CollectTotalUpDto> totalUp3(LocalDate date1,LocalDate date2, Long departmentId);
+    List<CollectTotalUpDto> totalUp1(Long outId);
+    List<CollectTotalUpDto> totalUp6(Long outId);
+
+    /**
+     * 车辆转运异常预警
+     *
+     * @return
+     */
+    List<MwTransitCarWarningVO> queryWarningList();
 }

--
Gitblit v1.7.1