diff --git a/yudao-module-tblist/yudao-module-tblist-biz/pom.xml b/yudao-module-tblist/yudao-module-tblist-biz/pom.xml index b49238ef8..bb5288f51 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/pom.xml +++ b/yudao-module-tblist/yudao-module-tblist-biz/pom.xml @@ -136,6 +136,12 @@ 2.1.0-jdk8-snapshot compile + + com.itextpdf + itextpdf + 5.5.13.4 + compile + diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java index 83e41dc69..4f7d51d0e 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/EcganalysisparasController.java @@ -144,11 +144,16 @@ public class EcganalysisparasController { ecgPrintPdf.setPtimelimit(updateReqVO.getPTimeLimit()); //查询医生的签名图片 DoctorDO doctorDO = Service.getBydoctorID(String.valueOf(updateReqVO.getDoctorId())); - if(!doctorDO.getESignatureUrl().isEmpty()) + if(doctorDO!=null&&doctorDO.getESignatureUrl()!=null) { ecgPrintPdf.setImage(doctorDO.getESignatureUrl()); } - ecgPrintPdf.setDepartName(doctorDO.getDepartmentName()); + System.out.println("获取医生完成"); + if(doctorDO!=null&&doctorDO.getDepartmentName()!=null) + { + ecgPrintPdf.setDepartName(doctorDO.getDepartmentName()); + } + ecgPrintPdf.setDoctorDiagTime(DateUtils.formateddatetime(Long.parseLong(updateReqVO.getDiagtime()))); ecgPrintPdf.setDiagContent(updateReqVO.getDoctorDiagResult()); ecgPrintPdf.setDoctorName(updateReqVO.getDoctorName()); diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/vo/EcgPrintPdf.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/vo/EcgPrintPdf.java index 28724f072..52b2e5850 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/vo/EcgPrintPdf.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/ecganalysisparas/vo/EcgPrintPdf.java @@ -29,7 +29,6 @@ public class EcgPrintPdf { private String filepath; private String orgid; private String orgname; - private String orgid; private String ptimelimit; private String isAbnormal; }