zjh
2024-04-25 a74b5ffd9c25edd8096220920934e3e42f62cc23
zjh 2024/04/25-1
4个文件已修改
8个文件已添加
249 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/test/java/zjhTest.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdviceKjbq.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjUserAdvice.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAdviceKjbqMapper.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjUserAdviceMapper.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAdviceKjbqService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjUserAdviceService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAdviceKjbqServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjUserAdviceServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -1,5 +1,6 @@
package com.ltkj.web.controller.system;
import java.nio.channels.NonReadableChannelException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -11,14 +12,21 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.Excel;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.hosp.domain.TjAdvice;
import com.ltkj.hosp.domain.TjAdviceKjbq;
import com.ltkj.hosp.domain.TjProject;
import com.ltkj.hosp.domain.TjUserAdvice;
import com.ltkj.hosp.service.ITjAdviceService;
import com.ltkj.hosp.service.ITjProjectService;
import com.ltkj.hosp.service.TjAdviceKjbqService;
import com.ltkj.hosp.service.TjUserAdviceService;
import com.ltkj.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
@@ -39,6 +47,107 @@
    private ITjAdviceService tjAdviceService;
    @Resource
    private ITjProjectService tjProjectService;
    @Resource
    private TjAdviceKjbqService kjbqService;
    @Resource
    private TjUserAdviceService userAdviceService;
    @Autowired
    private ISysUserService userService;
    @PostMapping("/addTjAdviceKjbq")
    @ApiOperation(value = "新增体检建议快捷标签接口")
    public AjaxResult addTjAdviceKjbq(@RequestBody TjAdviceKjbq adviceKjbq) {
        return AjaxResult.success(kjbqService.save(adviceKjbq));
    }
    @DeleteMapping("/deletedTjAdviceKjbq")
    @ApiOperation(value = "根据id删除体检建议快捷标签接口")
    public AjaxResult deletedTjAdviceKjbq(@RequestParam Long adviceKjbqId) {
        return AjaxResult.success(kjbqService.removeById(adviceKjbqId));
    }
    @PutMapping("/updateTjAdviceKjbq")
    @ApiOperation(value = "修改体检建议快捷标签接口")
    public AjaxResult updateTjAdviceKjbq(@RequestBody TjAdviceKjbq adviceKjbq) {
        return AjaxResult.success(kjbqService.updateById(adviceKjbq));
    }
    @PostMapping("/updateQybzTjAdviceKjbqById")
    @ApiOperation(value = "修改体检建议快捷标签启用状态接口")
    public AjaxResult updateQybzTjAdviceKjbqById(@RequestParam int qybz,@RequestParam Long id) {
        TjAdviceKjbq kjbq = kjbqService.getById(id);
        kjbq.setQyzt(String.valueOf(qybz));
        return AjaxResult.success(kjbqService.updateById(kjbq));
    }
    @GetMapping("/getTjAdviceKjbqByFl")
    @ApiOperation(value = "根据标签分类查询体检建议快捷标签接口")
    public AjaxResult getTjAdviceKjbqByFl(@RequestParam(required = false)@ApiParam(value = "用户id  传当前登录人  超管登录时不传 为null") String userId,
                                          @RequestParam(required = false)@ApiParam(value = "启用状态 0启用 1停用")  Integer qyzt,
                                          @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                          @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
        LambdaQueryWrapper<TjAdviceKjbq> wq = new LambdaQueryWrapper<>();
        Page<TjAdviceKjbq> page1=new Page<>(page,pageSize);
        if (null != userId && !userId.equals("")) {
            wq.eq(TjAdviceKjbq::getUserId, userId);
        }
        if (null != qyzt) {
            wq.eq(TjAdviceKjbq::getQyzt,qyzt);
        }
        Page<TjAdviceKjbq> kjbqPage = kjbqService.page(page1, wq);
        if(null !=kjbqPage.getRecords() && kjbqPage.getRecords().size()>0){
            for (TjAdviceKjbq record : kjbqPage.getRecords()) {
                if(null !=record.getUserId()){
                    record.setUserName(userService.getById(record.getUserId()).getNickName());
                }
            }
        }
        return AjaxResult.success(kjbqPage);
    }
    @GetMapping("/getKjTjAdviceKjbqBySex")
    @ApiOperation(value = "根据体检人性别和是否为总检查询体检建议接口")
    public AjaxResult getKjTjAdviceKjbqBySex(@RequestParam String sex, @RequestParam @ApiParam(value = "0常规医生 1总检") String isZj,
                                             @ApiParam(value = "页码数(默认1)") @RequestParam(defaultValue = "1") Integer page,
                                             @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize) {
        LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();
        Page<TjAdvice> page1=new Page<>(page,pageSize);
        wq.eq(TjAdvice::getAdSex, sex);
        wq.eq(TjAdvice::getIsZj, isZj);
        Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq);
        return AjaxResult.success(kjbqPage);
    }
    @GetMapping("/getCyTjAdviceKjbqBySex")
    @ApiOperation(value = "根据当前登录人id获取常用建议")
    public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam 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<>();
        Page<TjAdvice> page1=new Page<>(page,pageSize);
        wq.eq(TjAdvice::getAdSex, sex);
        if (null != userId) {
            LambdaQueryWrapper<TjUserAdvice> wq0=new LambdaQueryWrapper<>();
            wq0.eq(TjUserAdvice::getUserId,userId);
            List<TjUserAdvice> list = userAdviceService.list(wq0);
            if(null !=list && list.size()>0){
                List<Long> longs = list.stream().map(TjUserAdvice::getAdviceId).collect(Collectors.toList());
                wq.in(TjAdvice::getId, longs);
                Page<TjAdvice> kjbqPage = tjAdviceService.page(page1, wq);
                return AjaxResult.success(kjbqPage);
            }
        }
        return AjaxResult.success("该用户暂时没有常用建议!");
    }
    /**
     * 查询advice列表
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -465,6 +465,7 @@
//            }
//            return getResult(page, pageSize, orderList, customerList, map);
//        }
        String value = String.valueOf(compId);
        if (tjNumber == null) tjNumber = "";
        if (compId == null) value = "";
ltkj-admin/src/test/java/zjhTest.java
@@ -2,6 +2,8 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.extra.qrcode.QrCodeUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.LtkjApplication;
import com.ltkj.common.core.redis.RedisCache;
@@ -65,17 +67,10 @@
    private String secret;
    @Test
    public void test() {
//        List<DictHosp> list = dictHospService.list();
//        DateTime dateTime1 = DateUtil.offsetMonth(new Date(),100);
//        for (DictHosp dictHosp : list) {
//        String mallMerchantSecretKey = SecurityUtils.getMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),dateTime1);
//            dictHosp.setSecretKey(mallMerchantSecretKey);
//            dictHosp.setExpirationTime(dateTime1);
//            dictHospService.updateById(dictHosp);
//        System.out.println(dateTime1);
//        System.out.println("=================================================");
//        System.out.println(mallMerchantSecretKey);
//    }
// 生成指定url对应的二维码到文件,宽和高都是300像素
         QrCodeUtil.generate("https://ltpeis.xaltjdkj.cn:5516/1000110001240327094056%E7%8E%89%E5%BF%A0_%E4%BD%93%E6%A3%80%E6%8A%A5%E5%91%8A.pdf", 300, 300, FileUtil.file("D:\\Users\\w\\Desktop\\qrcode.jpg"));
  }
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java
@@ -1,5 +1,6 @@
package com.ltkj.hosp.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -31,8 +32,7 @@
    /**
     * 主键
     */
    @TableId
    @TableField
    @TableId(type=IdType.AUTO)
    private Long id;
    /**
@@ -56,6 +56,25 @@
    @ApiModelProperty(value = "建议")
    private String advice;
    @Excel(name = "所属科室id")
    @ApiModelProperty(value = "所属科室id")
    private String dept_id;
    @Excel(name = "快捷标签")
    @ApiModelProperty(value = "快捷标签")
    private String kjbq;
    @Excel(name = "建议人员性别")
    @ApiModelProperty(value = "建议人员性别")
    private String adSex;
    @Excel(name = "是否总检")
    @ApiModelProperty(value = "是否总检  0常规  1总检")
    private String isZj;
    @TableField(exist = false)
    @ApiModelProperty(value = "项目名字")
    private String proName;
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdviceKjbq.java
New file
@@ -0,0 +1,25 @@
package com.ltkj.hosp.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ltkj.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@ApiModel(value = "体检建议快捷标签表")
@AllArgsConstructor
@NoArgsConstructor
public class TjAdviceKjbq extends BaseEntity {
    @TableId(type = IdType.AUTO)
    private Long id;
    private String bqType;
    private String kjbq;
    private Long userId;
    private String qyzt;
    @TableField(exist = false)
    private String userName;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjUserAdvice.java
New file
@@ -0,0 +1,20 @@
package com.ltkj.hosp.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ltkj.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@ApiModel(value = "体检用户常用建议表")
@AllArgsConstructor
@NoArgsConstructor
public class TjUserAdvice extends BaseEntity {
    @TableId(type = IdType.AUTO)
    private Long id;
    private Long userId;
    private Long adviceId;
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjAdviceKjbqMapper.java
New file
@@ -0,0 +1,9 @@
package com.ltkj.hosp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjAdviceKjbq;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface TjAdviceKjbqMapper extends BaseMapper<TjAdviceKjbq> {
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjUserAdviceMapper.java
New file
@@ -0,0 +1,9 @@
package com.ltkj.hosp.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjUserAdvice;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface TjUserAdviceMapper extends BaseMapper<TjUserAdvice> {
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjAdviceKjbqService.java
New file
@@ -0,0 +1,7 @@
package com.ltkj.hosp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjAdviceKjbq;
public interface TjAdviceKjbqService extends IService<TjAdviceKjbq> {
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjUserAdviceService.java
New file
@@ -0,0 +1,7 @@
package com.ltkj.hosp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.domain.TjUserAdvice;
public interface TjUserAdviceService extends IService<TjUserAdvice> {
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjAdviceKjbqServiceImpl.java
New file
@@ -0,0 +1,11 @@
package com.ltkj.hosp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjAdviceKjbq;
import com.ltkj.hosp.mapper.TjAdviceKjbqMapper;
import com.ltkj.hosp.service.TjAdviceKjbqService;
import org.springframework.stereotype.Service;
@Service
public class TjAdviceKjbqServiceImpl extends ServiceImpl<TjAdviceKjbqMapper, TjAdviceKjbq> implements TjAdviceKjbqService {
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjUserAdviceServiceImpl.java
New file
@@ -0,0 +1,11 @@
package com.ltkj.hosp.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ltkj.hosp.domain.TjUserAdvice;
import com.ltkj.hosp.mapper.TjUserAdviceMapper;
import com.ltkj.hosp.service.TjUserAdviceService;
import org.springframework.stereotype.Service;
@Service
public class TjUserAdviceServiceImpl extends ServiceImpl<TjUserAdviceMapper,TjUserAdvice> implements TjUserAdviceService {
}