lige
2023-12-20 db9224e977ce336a4f7879e850e67cd18523278c
是否打报告
4个文件已修改
21 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -939,6 +939,8 @@
        if (null != sysUser && !sysUser.getUserName().equals("10001")) {
            wq2.eq(TjProject::getDeptId, ksId);
        }
        //判断该项目是否需要打印报告
        wq2.eq(TjProject::getNeedReport,"Y");
        List<TjProject> Deptlist = projectService.list(wq2);
        List<Long> proIdList = Deptlist.stream().map(TjProject::getProId).collect(Collectors.toList());
        if (Deptlist.size() == 0 || proIdList.size() == 0) {
@@ -1014,6 +1016,10 @@
        if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject project = projectService.getById(tjOrderDetail.getProId());
                //判断该项目是否需要打印报告
                if ("N".equals(project.getNeedReport())){
                    continue;
                }
                //病种回显
//                LambdaQueryWrapper<TjOrderDetailRules> wq=new LambdaQueryWrapper<>();
//                wq.eq(TjOrderDetailRules::getProId,project.getProId());
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -543,6 +543,10 @@
                Map<String, Object> parent = new HashMap<>();
                parent.put("checkAdvice", one.getCheckAdvice());
                TjProject project = projectService.selectTjProjectByProId(remark.getProId());
                //判断该项目是否需要打印报告
                if ("N".equals(project.getNeedReport())){
                    continue;
                }
                if (null != project) {
                    parent.put("parent", project.getProName());
                    parent.put("parentId", project.getProId().toString());
@@ -590,7 +594,6 @@
                } else {
                    return AjaxResult.success("该客户没有体检项目数据");
                }
//                }
            }
            return AjaxResult.success(list);
        }
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -444,7 +444,11 @@
                        LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
                        wqqq.eq(TjProject::getProId, entry.getKey().getProId());
                        TjProject one11 = projectService.getOne(wqqq);
                        if ("1".equals(one11.getProCheckMethod())) {
                        //判断该项目是否需要打印报告
                        if ("N".equals(one11.getNeedReport())){
                            continue;
                        }
                        if ("1".equals(one11.getResultType())) {
                            String titleName = one11.getProName();
                            // 设置标题字体样式
                            Font titleFonts = PdfUtils.setFont(9);
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProject.java
@@ -240,6 +240,10 @@
    @ApiModelProperty(value = "是否空腹")
    private String isEat;
    @ApiModelProperty(value = "是否打报告'Y/N'")
    private String needReport;
    /**
     * 子项目
     */