Merge remote-tracking branch 'origin/master'

luoyisheng

2025-03-25 b03d89e792a34c486f0afeab69e837f85d8cbe16

 medicalWaste-system/src/main/java/com/sinata/system/mapper/MwCheckoutRecordMapper.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;
import org.apache.ibatis.annotations.Mapper;
@@ -43,10 +44,10 @@
    /**
     * 转运记录详情
     *
     * @param departmentId
     * @param id
     * @return
     */
    MwCheckoutRecordVO hospitalDetail(Long departmentId);
    MwCheckoutRecordVO hospitalDetail(Long id);

    /**
     * 转运记录医废详情分页列表
@@ -65,7 +66,7 @@
     * @param treeCode
     * @return
     */
    Page<MwTransitRecordVO> transitPageList(Page<MwTransitRecordVO> page, @Param("query") MwTransitRecordQuery query, String treeCode);
    Page<MwTransitRecordVO> transitPageList(Page<MwTransitRecordVO> page, @Param("query") MwTransitRecordQuery query, @Param("treeCode") String treeCode);

    /**
     * 运输记录详情
@@ -82,7 +83,7 @@
     * @param id
     * @return
     */
    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> objectPage, Long id);
    Page<MwMedicalWasteBoxVO> transitDetailPageList(Page<MwMedicalWasteBoxVO> page, @Param("id") Long id);

    /**
     * 转运记录导出
@@ -93,7 +94,12 @@
    List<MwCheckoutRecordVO> hospitalTransitList(@Param("query") CheckoutRecordQuery query, @Param("treeCode") String treeCode);

    List<CollectTotalUpDto> totalUp(@Param("date") LocalDate date, @Param("departmentId")Long departmentId);
    List<CollectTotalUpDto> totalUp4(@Param("departmentId")Long departmentId);
    List<CollectTotalUpDto> totalUp2(@Param("date") LocalDate date ,@Param("departmentId")Long departmentId);
    List<CollectTotalUpDto> totalUp5(@Param("departmentId")Long departmentId);
    List<CollectTotalUpDto> totalUp3(@Param("date1") LocalDate date1, @Param("date2") LocalDate date2,@Param("departmentId")Long departmentId);
    List<CollectTotalUpDto> totalUp1(@Param("outId")Long outId);
    List<CollectTotalUpDto> totalUp6(@Param("outId")Long outId);

    /**
     * 转移联单数据
@@ -112,4 +118,11 @@
     * @return
     */
    List<MwCollectRecordVO> getRegulationReportList(@Param("query") DisposalReportQuery query, @Param("treeCode") String treeCode);

    /**
     * 车辆转运异常预警
     *
     * @return
     */
    List<MwTransitCarWarningVO> queryWarningList();
}