Merge remote-tracking branch 'origin/master'

zhaowenxuan

7 天以前 0892d843cd394f383ff50f480f7f22f2ec3829bc

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjReportServiceImpl.java

@@ -145,10 +145,10 @@
        return tjReportMapper.deleteTjReportByReId(reId);
    }

    @Value("${path.filePath}")
    private String value;
//    @Value("${path.filePath}")
//    private String value;

    @Override
   /* @Override
    public AjaxResult getTjReport(String tjNumber) {
        //根据体检号
        //在order里查询体检状态 判断体检是否完成
@@ -179,9 +179,9 @@
                    TjProject tjProject = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
                    tjOrderDetail.setProject(tjProject);
                }
                /*
                *//*
                 * ====================第一部分 填充体检报告封面模板
                 * */
                 * *//*
                //根据数据库中的模板二进制文件  转pdf  创建文件夹  将pdf放进文件夹
                LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
                tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
@@ -254,9 +254,9 @@
                    ps.close();
                    os.close();
                    reader.close();
                    /*
                    *//*
                     * ==========================第二部分  生成项目详情
                     */
                     *//*
                    //文档对象  实现A4纸页面
                    Document document = new Document(PageSize.A4);
                    //document.setMarginMirroring(true);
@@ -323,9 +323,9 @@
                        LineSeparator objectName = new LineSeparator();
                        document.add(objectName);
                    }
                    /*
                    *//*
                     * document关闭的其实是文件的监听状态，writer关闭的是io流，writer创建在document之后
                     * */
                     * *//*
                    document.close();
                    pdfWriter.close();
                    outputStream.close();
@@ -372,7 +372,7 @@
            }
        }
        return null;
    }
    }*/

    @Override
    public Integer getSelectCount(Wrapper<TjReport> queryWrapper) {
@@ -520,8 +520,8 @@


    @Override
    public AjaxResult makeBatchReport(List<String> tjNumbers) {
        return sqlGetReportToMake(tjNumbers);
    public AjaxResult makeBatchReport(List<String> tjNumbers,String value) {
        return sqlGetReportToMake(tjNumbers,value);

    }

@@ -568,7 +568,7 @@
//        }
//    }

    private AjaxResult sqlGetReportToMake(List<String> tjNumbers) {
    private AjaxResult sqlGetReportToMake(List<String> tjNumbers, String value) {
//        LambdaQueryWrapper<TjReport> tjReportLambdaQueryWrapper = new LambdaQueryWrapper<>();
//        tjReportLambdaQueryWrapper.in(TjReport::getTjNumber, tjNumbers);
//        List<TjReport> list = tjReportService.list(tjReportLambdaQueryWrapper);