Merge remote-tracking branch 'origin/master'

luoyisheng

2025-02-12 05628d269dff7ad4f2e9d3419b05b4e7e5768797

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

@@ -12,6 +12,7 @@
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;

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

    /**
     * 转运记录医废详情分页列表
@@ -109,4 +110,12 @@
    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();
}