zjh20250702

zjh

2 天以前 14ecea8537d5b29ca64c75aad4ff49265018415d

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

@@ -1817,7 +1817,7 @@
                //判断该项目是否需要打印报告
                if (null != one11 && "Y".equals(one11.getNeedReport())) {
                    TjOrderRemark orderRemark = entry.getKey();
                    List<TjPdfVO> value = entry.getValue();
                    List<TjPdfVO> value = entry.getValue().stream().distinct().collect(Collectors.toList());
                    if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
                        continue;
                    }
@@ -2602,12 +2602,13 @@
                    TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
                    if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
                        tjOrderDetail.setProject(tjProject);
                        TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());

                        if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId())
                                && entry.getKey().getType() == 1
                                && !ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId()))) {
                                && (!ids.contains(String.valueOf(tjOrderDetail.getProject().getProParentId())) &&
                                !ids.contains(tjProjectq.getHisXmbm()))) {

                            TjProject tjProjectq = projectService.getById(tjOrderDetail.getProject().getProParentId());
                            TjPdfVO tjPdfVO = new TjPdfVO();
                            tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
                            tjPdfVO.setProResult(tjOrderDetail.getProResult());