Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

 medicalWaste-system/src/main/java/com/sinata/system/service/MwCollectRecordService.java

@@ -11,6 +11,7 @@
import com.sinata.system.domain.query.MwCollectRecordQuery;
import com.sinata.system.domain.vo.MedicalWasteProcessVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.domain.vo.MwCollectRecordWarningVO;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
@@ -50,6 +51,7 @@
     */
    void edit(MwCollectRecordDTO dto);
    List<CollectDto> getGroup(String boxNumber,Long departmentId);
    List<CollectDto> getGroupWithStatus(String boxNumber,Long departmentId,Integer status);
    List<CollectDto> getGroup1(String boxNumber,Long departmentId);

    /**
@@ -70,6 +72,7 @@
    void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException;

    List<CollectTotalUpDto>  collectTotal(LocalDate date,Long departmentId);
    List<CollectTotalUpDto>  collectTotal3(Long departmentId);
    List<CollectTotalUpDto>  collectTotal1(LocalDate date,Long checkOutUserId,Long hospitalId);

    List<CollectCarTotalUpDto> carGroup(Long carId);
@@ -81,4 +84,23 @@
     * @return
     */
    List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);

    /**
     * 查询昨日产废记录
     *
     * @return
     */
    List<MwCollectRecordWarningVO> queryListByDay();

    /**
     * 查询上月产废记录
     *
     * @return
     */
    List<MwCollectRecordWarningVO> queryListByMonth();

    /**
     * @return
     */
    List<MwCollectRecordWarningVO> queryListGroupByDepartment();
}