zjh20250410

zjh

2025-04-10 6d09c6301492d3095ff64dba2336f0d0b69638e6

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java

@@ -117,6 +117,7 @@
    @ApiOperation(value = "根据体检人性别和是否为总检查询体检建议接口")
    public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "1常规医生 0总检") String isZj,
                                             @RequestParam(required = false) @ApiParam(value ="建议内容") String jynr,
                                             @RequestParam(required = false) @ApiParam(value ="建议标题") String jybt,
                                             @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                             @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
        LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();
@@ -124,7 +125,8 @@
//        wq.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex);
        wq.eq(TjAdvice::getIsZj, isZj);
        if(StringUtil.isNotBlank(jynr)) wq.like(TjAdvice::getAdvice,jynr);
        wq.and(i -> i.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex));
        if(StringUtil.isNotBlank(jybt)) wq.like(TjAdvice::getTitle,jybt);
//        wq.and(i -> i.eq(TjAdvice::getAdSex, sex).or().isNull(TjAdvice::getAdSex));
        Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq);
        return AjaxResult.success(kjbqPage);
    }
@@ -132,7 +134,7 @@

    @GetMapping("/getCyTjAdviceKjbqBySex")
    @ApiOperation(value = "根据当前登录人id获取常用建议")
    public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "用户id 传当前登录人") Long userId,
    public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam(required = false) String sex, @RequestParam @ApiParam(value = "用户id 传当前登录人") Long userId,
                                             @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                             @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
        LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();
@@ -142,10 +144,9 @@
            LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
            wq0.eq(TjUserAdvice::getUserId, userId);
            List<TjUserAdvice> list = userAdviceService.list(wq0);
            if (null != list && list.size() > 0) {
            if (null != list && !list.isEmpty()) {
                List<Long> longs = list.stream().map(TjUserAdvice::getAdviceId).collect(Collectors.toList());
                wq.in(TjAdvice::getId,longs);
                wq.last("and (ad_sex=1 OR ad_sex=2)");
                Page<TjAdvice> kjbqPage = tjAdviceService.page(page1,wq);
                return AjaxResult.success(kjbqPage);
            }
@@ -158,7 +159,7 @@
    @ApiOperation(value = "添加当前登录人常用建议接口")
    public AjaxResult addCyTjAdviceByUserId(@RequestParam @ApiParam(value = "所选建议主键id数组") List<Long> adviceIds) {
        String userId = UserHoder.getLoginUser().getUserId();
        if (null != adviceIds && adviceIds.size() > 0) {
        if (null != adviceIds && !adviceIds.isEmpty()) {
            for (Long id : adviceIds) {
                TjUserAdvice tjUserAdvice = userAdviceService.getTjUserAdviceByUserId(Long.valueOf(userId), id);
                if (null == tjUserAdvice) {
@@ -172,6 +173,30 @@
        }
        return AjaxResult.success("请选择您要添加的建议!");
    }


    @GetMapping("/edaitCyTjAdviceByUserId")
    @ApiOperation(value = "修改当前登录人常用建议接口")
    public AjaxResult edaitCyTjAdviceByUserId(@RequestParam @ApiParam(value = "所选建议主键id数组") List<Long> adviceIds) {
        String userId = UserHoder.getLoginUser().getUserId();
        if (null != adviceIds && !adviceIds.isEmpty()) {
            LambdaQueryWrapper<TjUserAdvice> wq=new LambdaQueryWrapper<>();
            wq.eq(TjUserAdvice::getUserId,userId);
            userAdviceService.remove(wq);
            for (Long id : adviceIds) {
                TjUserAdvice tjUserAdvice = userAdviceService.getTjUserAdviceByUserId(Long.valueOf(userId), id);
                if (null == tjUserAdvice) {
                    TjUserAdvice userAdvice = new TjUserAdvice();
                    userAdvice.setAdviceId(id);
                    userAdvice.setUserId(Long.valueOf(userId));
                    userAdviceService.save(userAdvice);
                }
            }
            return AjaxResult.success("添加成功!");
        }
        return AjaxResult.success("请选择您要添加的建议!");
    }



    @PostMapping("/addCyTjAdvice")
@@ -270,8 +295,8 @@
//        }
//        map.put("list", list);
//        map.put("total", page2.getTotal());
        List<TjAdvice> tjAdvices = tjAdviceService.selectList(proName, deptId, (page - 1) * pageSize, pageSize);
        Integer count = tjAdviceService.selectListCount(proName, deptId);
        List<TjAdvice> tjAdvices = tjAdviceService.selectList(proName, deptId, (page - 1) * pageSize, pageSize,bt,nr);
        Integer count = tjAdviceService.selectListCount(proName, deptId,bt,nr);
        HashMap<String, Object> hashMap = new HashMap<>();
        hashMap.put("list",tjAdvices);
        hashMap.put("total",count);
@@ -325,6 +350,7 @@
//    @PreAuthorize("@ss.hasPermi('advice:advice:edit')")
    @Log(title = "advice", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改体检建议接口")
    public AjaxResult edit(@RequestBody TjAdvice tjAdvice) {
        return AjaxResult.success(tjAdviceService.updateById(tjAdvice));
    }