From c63daceb66fbb7faa56849e695c07e28447818b9 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 29 四月 2025 14:18:46 +0800
Subject: [PATCH] pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null
---
ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java
index 1580bef..e7a9ab1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinimpapplyDto.java
@@ -11,10 +11,10 @@
private Integer mzzdid;
private String sqysbm;
private String mzksbm;
- @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
- private Date fbrq;
- @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
- private Date zdrq;
+// @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
+ private String fbrq;
+// @JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
+ private String zdrq;
private String czybm;
private String czyksbm;
private String zs;
@@ -37,4 +37,5 @@
private String sfqj;
@JsonFormat(pattern = "yyyy-mm-dd hh:mm:ss")
private Date ckrq;
+ private Integer jzqk;
}
--
Gitblit v1.8.0