弃检见附件以及主键医师不打印

zhaowenxuan

1 天以前 2a85542341319a4085b04ec9a6a667be6ae799df

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

@@ -2484,7 +2484,10 @@
                doctorNameDefault = entry.getValue().get(0).getShys();
            }
            Font doctorFonts = PdfUtils.setFont(9);
            if (key.equals("Y")) {
            if (entry.getValue().get(0).getIsShowYiShi() == null){
                entry.getValue().get(0).setIsShowYiShi(true);
            }
            if (key.equals("Y") && entry.getValue().get(0).getIsShowYiShi()) {
                String qmImg = dictUserInfoMapper.selectQmImgInnerJoinUserByUserId(String.valueOf(sysUser.getUserId()));
                if (null != qmImg && StrUtil.isNotBlank(qmImg)) {
                    Paragraph elements = new Paragraph();
@@ -2522,7 +2525,7 @@
                    df.setAlignment(Element.ALIGN_RIGHT);
                    document1.add(df);
                }
            } else {
            } else if (entry.getValue().get(0).getIsShowYiShi()) {
                String doctorName = "主检医师：" + doctorNameDefault;
                if (createTime != null)
                    doctorName = "检查时间：" + new SimpleDateFormat("yyyy-MM-dd").format(createTime) + "             主检医师：" + doctorNameDefault;
@@ -2681,12 +2684,13 @@
                            } catch (Exception ignored) {
                            }
                        }
                        String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
                        if (null != shys && null != shysmc && key.equals("Y")) {
                            hashSet.add(shysmc + "|" + shys);
                        } else {
                            if (null != shysmc) hashSet.add(shysmc);
                        }
                        // 结果弃检重复去除医师打印
//                        String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
//                        if (null != shys && null != shysmc && key.equals("Y")) {
//                            hashSet.add(shysmc + "|" + shys);
//                        } else {
//                            if (null != shysmc) hashSet.add(shysmc);
//                        }
                        ArrayList<String> strings = new ArrayList<>();
                        strings.add(xmmc);
                        strings.add(groupOnceProResult);
@@ -2699,10 +2703,11 @@
                        HashMap<String, Object> map = new HashMap<>();
                        map.put("data", lists);
                        map.put("jyys", hashSet);
                        if (StrUtil.isNotBlank(shsj)) {
                            shsj = shsj.split(" ")[0];
                        }
                        map.put("shsj", shsj);
//                        if (StrUtil.isNotBlank(shsj)) {
//                            shsj = shsj.split(" ")[0];
//                        }
//                        map.put("shsj", shsj);
                        map.put("shsj","");
                        data.put(xmmc, map);
                    }
                }
@@ -2945,6 +2950,7 @@
                                //                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
                                //                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
                                //                        wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
                                tjPdfVO.setIsShowYiShi(true);
                                tjPdfVOS.add(tjPdfVO);
                            }
                        }
@@ -2961,6 +2967,7 @@
                        tjPdfVO.setProId(String.valueOf(orderRemark.getProId()));
                        tjPdfVO.setPid(String.valueOf(orderRemark.getProId()));
                        tjPdfVO.setXh(1);
                        tjPdfVO.setIsShowYiShi(false);
                        tjPdfVOS.add(tjPdfVO);
                    }
                }