Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-28 73a0ffbc8f1c5c625ce4bb3225c0e5e30179520e

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

@@ -7,6 +7,7 @@
import com.sinata.system.domain.dto.CollectDto;
import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.domain.dto.MwCollectRecordDTO;
import com.sinata.system.domain.query.DisposalReportQuery;
import com.sinata.system.domain.query.MwCollectRecordQuery;
import com.sinata.system.domain.vo.MedicalWasteProcessVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
@@ -14,6 +15,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDate;
import java.util.List;
import java.util.List;

/**
@@ -48,6 +50,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);

    /**
@@ -58,10 +61,25 @@
     */
    MedicalWasteProcessVO getProcess(Long id);

    /**
     * 导出
     *
     * @param query
     * @param response
     * @throws IOException
     */
    void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException;

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

    List<CollectCarTotalUpDto> carGroup(Long carId);

    /**
     * 监管报表医疗废物产生列表
     *
     * @param query
     * @return
     */
    List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query);
}