修改bug

liujie

2 天以前 59099ec96f7a2da11df4b0b1593092b0aff38e90

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysChronicDiseaseController.java

@@ -6,8 +6,11 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.model.TSysAppUser;
import com.ruoyi.system.model.TSysChronicDisease;
import com.ruoyi.system.query.TSysChronicDiseaseQuery;
import com.ruoyi.system.service.TSysAppUserService;
import com.ruoyi.system.service.TSysChronicDiseaseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,6 +18,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
@@ -31,9 +35,11 @@
public class TSysChronicDiseaseController {

    private final TSysChronicDiseaseService sysChronicDiseaseService;
    private final TSysAppUserService sysAppUserService;
    @Autowired
    public TSysChronicDiseaseController(TSysChronicDiseaseService sysChronicDiseaseService) {
    public TSysChronicDiseaseController(TSysChronicDiseaseService sysChronicDiseaseService, TSysAppUserService sysAppUserService) {
        this.sysChronicDiseaseService = sysChronicDiseaseService;
        this.sysAppUserService = sysAppUserService;
    }

    /**
@@ -53,6 +59,29 @@
    public R<List<TSysChronicDisease>> list() {
        return R.ok(sysChronicDiseaseService.list(Wrappers.lambdaQuery(TSysChronicDisease.class).orderByDesc(TSysChronicDisease::getCreateTime)));
    }
    /**
     * 获取慢性病管理管理列表
     */
    @ApiOperation(value = "通过用户id获取慢性病管理列表")
    @GetMapping(value = "/listByAppUserId")
    public R<List<TSysChronicDisease>> listByAppUserId(@RequestParam String appUserId) {

        TSysAppUser sysAppUser = sysAppUserService.getById(appUserId);
        if (sysAppUser == null) {
            return R.fail("用户不存在");
        }
        String chronicDiseaseId = sysAppUser.getChronicDiseaseId();
        if(StringUtils.isNotBlank(chronicDiseaseId)){
            String[] split = chronicDiseaseId.split(",");
            List<TSysChronicDisease> sysChronicDiseases = sysChronicDiseaseService.list(Wrappers.lambdaQuery(TSysChronicDisease.class)
                    .notIn(TSysChronicDisease::getId, Arrays.asList(split))
                    .orderByDesc(TSysChronicDisease::getCreateTime));
            return R.ok(sysChronicDiseases);
        }else {
            return R.ok(sysChronicDiseaseService.list(Wrappers.lambdaQuery(TSysChronicDisease.class).orderByDesc(TSysChronicDisease::getCreateTime)));
        }

    }

    /**
     * 添加慢性病管理管理