zjh
2025-01-23 b8e7b7cd4fd4f9305ac0eef7df08aaec98ec0b82
zjh20250122
4个文件已修改
73 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1429,6 +1429,7 @@
//    @Transactional
    @GetMapping("/getParentList")
    @ApiOperation(value = "医生点击体检信息详情(只显示父项目列表)")
//    修改按照科室查询
    public AjaxResult getParentList(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        String userId = SecurityUtils.getLoginUser().getUserId();
        Integer ksId = null;
@@ -1489,15 +1490,13 @@
        String config = configService.selectConfigByKey("qt_open_xdt");
        String byKey = configService.selectConfigByKey("qt_kjksid");
        List<Integer> split = new ArrayList<>(); // 存放转换后的integer类型结果
        Set<Integer> split = new HashSet<>(); // 存放转换后的integer类型结果
        split.add(ksId);
        if ("Y".equals(config)) {
            List<SysRole> roles = SecurityUtils.getLoginUser().getUser().getRoles();
            if (null != roles && !roles.isEmpty()) {
                List<SysRole> list = roles.stream().filter(item -> item.getRoleName().contains("前台")).collect(Collectors.toList());
                if (!list.isEmpty()) {
//                    if (null != ksId && ksId == 100) {
//                        ksId = 999;
//                    }
                    if (null != byKey && !byKey.isEmpty()) {
                        String[] arr = byKey.split(","); // 根据逗号进行切割
                        for (String s : arr) {
@@ -1505,36 +1504,15 @@
                            split.add(num); // 添加到列表中
                        }
                    }
                } else {
                    split.add(ksId);
                }
            } else {
                split.add(ksId);
            }
        } else {
            split.add(ksId);
        }
//        LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
//        if ((null != sysUser && !sysUser.getUserName().equals("10001")) && 100!=ksId) {
//            wq2.in(TjProject::getDeptId,split);
//        }
//        //判断该项目是否需要打印报告
//        wq2.eq(TjProject::getNeedReport,"Y");
//        List<TjProject> Deptlist = projectService.list(wq2);
//        List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
//        if (Deptlist.isEmpty() || proIdList.isEmpty()) {
//            return AjaxResult.error("该科室下无项目!");
//        }
            List<TjOrderRemark> list;
            if(null != sysUser && sysUser.getUserName().equals("10001")){
                list=remarkService.yiShengJianChaGetPrentProCJGLY(tjNumber);
            }else {
                list= remarkService.yiShengJianChaGetPrentPro(tjNumber, split);
            }
            if (null ==list || list.isEmpty()) {
                return AjaxResult.error("该科室下无项目!");
            }
@@ -1544,39 +1522,7 @@
                    tjOrderRemark.setProName(tjProject.getProName());
                }
            }
            return AjaxResult.success(list);
//            LambdaQueryWrapper<TjOrderDetail> wqq = new LambdaQueryWrapper<>();
//            wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
//            wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
//            wqq.in(TjOrderDetail::getProId, proIdList);
//            wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
//            List<TjOrderDetail> detailList = detailService.list(wqq);
//            if (detailList != null && !detailList.isEmpty()) {
//                List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
//                QueryWrapper<TjOrderRemark> wq = new QueryWrapper<>();
//                wq.eq("tj_number", tjNumber);
//                wq.in("pro_id", collect);
//                wq.ne("type", 2);
//                wq.ne("dept_id",241);
//                wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
//                List<TjOrderRemark> list = remarkService.list(wq);
//                if (list.isEmpty()) {
//                    return AjaxResult.success("该科室下无项目!");
//                }
//                for (TjOrderRemark tjOrderRemark : list) {
//                    TjProject tjProject = projectService.getById(tjOrderRemark.getProId());
//                    if (null != tjProject) {
//                        tjOrderRemark.setProName(tjProject.getProName());
//                    }
//                }
//                return AjaxResult.success(list);
//            }
//            return AjaxResult.success();
//    }
}
@Transactional
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ltkj.hosp.domain.TjOrderRemark;
@@ -217,7 +218,7 @@
            "#{id}",
            "</foreach>",
            "</script>" })
    List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") List<Integer> split);
    List<TjOrderRemark> yiShengJianChaGetPrentPro(@Param("tjNumber") String tjNumber,@Param("split") Set<Integer> split);
    @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id JOIN sys_dept c ON c.dept_id=a.dept_id\n" +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -11,6 +11,7 @@
import javax.validation.constraints.Size;
import java.util.List;
import java.util.Set;
/**
 * 医生备注Service接口
@@ -85,7 +86,7 @@
    void updateTjOrderRemarkSfbzByJxbzisnull(String orderId, String ls);
    List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber,List<Integer> split);
    List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, Set<Integer> split);
    List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(String tjNumber);
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -9,10 +9,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * 医生备注Service业务层处理
@@ -172,7 +169,7 @@
    }
    @Override
    public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, List<Integer> split) {
    public List<TjOrderRemark> yiShengJianChaGetPrentPro(String tjNumber, Set<Integer> split) {
        return mapper.yiShengJianChaGetPrentPro(tjNumber,split);
    }