java/YiFeiNN.git

			@@ -9,6 +9,7 @@
			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.query.TransitRecordQuery;
			import com.sinata.system.domain.vo.MwCheckoutRecordVO;
			import com.sinata.system.domain.vo.MwCollectRecordVO;
			import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
			@@ -19,7 +20,6 @@
			import javax.servlet.http.HttpServletResponse;
			import java.io.IOException;
			import java.time.LocalDate;
			import java.util.List;
			import java.util.List;

			/**
			@@ -42,10 +42,10 @@
			/**
			* 转运记录详情
			*
			* @param departmentId
			* @param id
			* @return
			*/
			MwCheckoutRecordVO hospitalDetail(Long departmentId);
			MwCheckoutRecordVO hospitalDetail(Long id);

			/**
			* 转运记录医废详情分页列表
			@@ -67,9 +67,10 @@
			* 运输记录详情
			*
			* @param id
			* @param query
			* @return
			*/
			MwTransitRecordVO transitDetail(Long id);
			MwTransitRecordVO transitDetail(TransitRecordQuery query);

			/**
			* 运输记录详情分页列表
			@@ -77,7 +78,7 @@
			* @param query
			* @return
			*/
			PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(MwTransitRecordQuery query);
			PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(TransitRecordQuery query);

			/**
			* 转运记录导出
			@@ -106,10 +107,11 @@

			List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId);
			List<CollectTotalUpDto> totalUp4(Long departmentId);
			List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, 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);

			/**
			* 车辆转运异常预警