bug

luoyisheng

2025-03-25 1abab3ed63e5648b8d88c412dce70aad0736b98a

bug

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java

@@ -94,8 +94,7 @@
    @ApiOperation("获取医院监管列表")
    @PostMapping("/hospita/list")
    public R<List<SysDepartment>> list(String name, Long areaId) {
        Long departmentId = SecurityUtils.getLoginUser().getUser().getDepartmentId();
        SysDepartment byId = sysDepartmentService.getById(departmentId);
        SysDepartment byId = sysDepartmentService.getMyDepartment();
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).eq(areaId != null, SysDepartment::getParentId, areaId).like(name != null, SysDepartment::getDepartmentName, name).eq(SysDepartment::getOrgType, 2).list();
        for (SysDepartment sysDepartment : list) {
            //获取医院暂存间信息
@@ -119,8 +118,9 @@

    @ApiOperation("获取处置监管列表")
    @PostMapping("/end/list")
    public R<List<SysDepartment>> list2(String name) {
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 3).list();
    public R<List<SysDepartment>> list2(String name,Long areaId) {
        SysDepartment byId = sysDepartmentService.getById(areaId);
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 3).list();
        LocalDate now = LocalDate.now();
        for (SysDepartment sysDepartment : list) {
            //获取库存总量

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCheckoutRecordController.java

@@ -94,7 +94,7 @@
    @PostMapping("/end/total")
    public R<List<CollectTotalUpDto>> outtotal1(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
        return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getUserId()));
        return R.ok(mwCheckoutRecordService.totalUp2(date,sysUser.getDepartmentId()));
    }

    @ApiOperation(value = "处置统下",tags = "处置人员")

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwCollectRecordController.java

@@ -210,7 +210,7 @@
    @PostMapping("/trans/collect/hospital/count")
    public R<Long> tanscollecttotal12(@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)LocalDate date) {
        SysUser  sysUser = SecurityUtils.getLoginUser().getUser();
        Long count = collectRecordService.lambdaQuery().eq(date!=null,MwCollectRecord::getCheckoutTime,date).eq(MwCollectRecord::getCheckoutUserId, sysUser.getUserId()).groupBy(MwCollectRecord::getDepartmentId).count();
        Long count = collectRecordService.lambdaQuery().ge(date!=null,MwCollectRecord::getCheckoutTime, date.atStartOfDay()).le(date!=null,MwCollectRecord::getCheckoutTime , date.atTime(23,59,59)).eq(MwCollectRecord::getCheckoutUserId, sysUser.getUserId()).groupBy(MwCollectRecord::getDepartmentId).count();
        return R.ok(count);
    }


 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwWarningRecordController.java

@@ -39,16 +39,17 @@
    @ApiOperation("预警记录")
    @PostMapping("/record")
    public R<Page<MwWarningRecord>> record(@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
        Page<MwWarningRecord> page = mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId, sysUser.getDepartmentId()).page(Page.of(pageNum, pageSize));
        SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
        Page<MwWarningRecord> page = mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId, myDepartment.getId()).page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }

    @ApiOperation(value = "预警统计",tags = "监管人员")
    @PostMapping("/danger")
    public R<List<SysDepartment>> danger(String name) {
    public R<List<SysDepartment>> danger(String name, Long areaId) {
        SysDepartment byId = sysDepartmentService.getById(areaId);
        //
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 2).list();
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(name!=null,SysDepartment::getDepartmentName,name).in(SysDepartment::getOrgType, 2,3).list();
        for (SysDepartment sysDepartment : list) {
            sysDepartment.setDangerCount(mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId,sysDepartment.getId()).count());
        }

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppUserController.java

@@ -15,6 +15,7 @@
import com.sinata.common.utils.poi.ExcelUtil;
import com.sinata.system.domain.MwApplication;
import com.sinata.system.domain.MwTransitCar;
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.SysUserDTO;
import com.sinata.system.domain.dto.SysUserStatusDTO;
import com.sinata.system.domain.query.SysUserQuery;
@@ -49,6 +50,7 @@
{
    private  final MwTransitCarService carService;
    private final ISysUserService userService;
    private final SysDepartmentService sysDepartmentService;
    @ApiOperation(value = "获取绑定车辆",tags = "运输人员")
    @PostMapping("/car")
    public R<MwTransitCar> car() {
@@ -65,8 +67,8 @@
    @ApiOperation(value = "获取车辆列表",tags = "运输人员")
    @PostMapping("/list")
    public R<List<MwTransitCar>> list() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        List<MwTransitCar> list = carService.lambdaQuery().eq(MwTransitCar::getDepartmentId,user.getDepartmentId()).list();
        SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
        List<MwTransitCar> list = carService.lambdaQuery().eq(MwTransitCar::getDepartmentId,myDepartment.getId()).list();
        return R.ok(list);
    }

@@ -74,7 +76,6 @@
    @PostMapping("/change")
    public R<List<MwTransitCar>> change(@RequestParam Long carId) {
        SysUser  sysUser = SecurityUtils.getLoginUser().getUser();

        SysUser byId = userService.getById(sysUser.getUserId());
        byId.setCarId(carId);
        userService.updateById(byId);

 medicalWaste-system/src/main/resources/mapper/system/MwCheckoutRecordMapper.xml

@@ -231,7 +231,7 @@
    <select id="totalUp" resultType="com.sinata.system.domain.dto.CollectTotalUpDto">
        SELECT WASTE_TYPE as wasteType,WASTE_TYPE_STR as wasteTypeStr,COUNT(DISTINCT BOX_NUMBER ) as boxNum ,COUNT(1)as num,sum(WEIGHT) as weight from MEDICAL_WASTE.MW_COLLECT_RECORD
        <where>
            CHECKOUT_TIME is not null AND DEPARTMENT_ID = #{departmentId} AND TRUNC(COLLECT_TIME, 'DAY') = TO_DATE(#{date},'YYYY-MM-DD')
            CHECKOUT_TIME is not null AND DEPARTMENT_ID = #{departmentId} AND TRUNC(CHECKOUT_TIME) = TO_DATE(#{date},'YYYY-MM-DD')
        </where>
        GROUP BY WASTE_TYPE
    </select>
@@ -248,12 +248,10 @@
    <select id="totalUp2" resultType="com.sinata.system.domain.dto.CollectTotalUpDto">
        SELECT WASTE_TYPE as wasteType,WASTE_TYPE_STR as wasteTypeStr,COUNT(DISTINCT BOX_NUMBER ) as boxNum ,COUNT(1)as num,sum(WEIGHT) as weight from MEDICAL_WASTE.MW_COLLECT_RECORD
        <where>
            RECEIVE_USER_ID is not null AND RECEIVE_USER_ID = #{departmentId}
            RECEIVE_USER_ID is not null AND DEPARTMENT_ID = #{departmentId}
            <if test="date != null">
                AND TRUNC(RECEIVE_TIME) == TO_DATE(#{date},'YYYY-MM-DD')
            </if>


        </where>
        GROUP BY WASTE_TYPE
    </select>