From 7dff38876f582644ae95daad8ac21d4f57088d56 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 28 十二月 2024 16:19:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- medicalWaste-system/src/main/java/com/sinata/system/service/MwCheckoutRecordService.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 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 06f8cf2..61c8769 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 @@ -5,15 +5,20 @@ 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.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; /** @@ -81,6 +86,23 @@ */ 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> totalUp1(Long outId); } -- Gitblit v1.7.1