zjh20250718

zjh

5 天以前 549809912b9fdb559e38cdbd099fee797a8df0ef

zjh20250718

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -3213,6 +3213,8 @@
                        if(tjProject.getProDelivery()==1){
                            if(StringUtil.isNotBlank(tjOrderDetail.getConclusion())){
                                tjPdfVO.setProResult(tjOrderDetail.getProResult()+"     "+tjOrderDetail.getConclusion());
                            }else {
                                tjPdfVO.setProResult(tjOrderDetail.getProResult());
                            }
                        }else {
                            tjPdfVO.setProResult(tjOrderDetail.getProResult());

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

@@ -12,6 +12,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.Excel;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.framework.config.UserHoder;
@@ -136,21 +138,35 @@
    @ApiOperation(value = "根据当前登录人id获取常用建议")
    public AjaxResult getCyTjAdviceKjbqBySex(@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).or().eq(TjAdvice::getAdSex,"2");
        if (null != userId) {
            LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
                                             @ApiParam(value = "显示条数(默认10)") @RequestParam(defaultValue = "10") Integer pageSize,
                                             @RequestParam(required = false) String nr) {
        LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
        if(!SecurityUtils.isAdmin(userId))
            wq0.eq(TjUserAdvice::getUserId, userId);
            List<TjUserAdvice> list = userAdviceService.list(wq0);
            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);
        List<TjUserAdvice> list = userAdviceService.list(wq0);
        List<TjAdvice> kjbqPage = new ArrayList<>();
        Map<String,Object> map = new HashMap<>();
        if (null != list && !list.isEmpty()) {
            for (TjUserAdvice advice : list) {
                TjAdvice advice1 = tjAdviceService.getById(advice.getAdviceId());
                if(null != advice1){
                    SysUser user = userService.getById(advice.getUserId());
                    if(null != user){
                        advice1.setUserName(user.getNickName());
                        kjbqPage.add(advice1);
                    }
                }
            }
            List<TjAdvice> adviceList =null;
            if(StringUtil.isNotBlank( nr)){
                adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr))
                        .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
            }else {
                adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
            }
            map.put("total", kjbqPage.size());
            map.put("records", adviceList);
            return AjaxResult.success(map);
        }
        return AjaxResult.success("该用户暂时没有常用建议!");
    }

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java

@@ -87,6 +87,9 @@
    @TableField(exist = false)
    private String deptName;

    @TableField(exist = false)
    private String userName;

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)