From b9de98ba9d9d7908c38f94fc2ec8917bdc89ef75 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 12 十二月 2024 19:27:45 +0800
Subject: [PATCH] 增加科室id字段
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 3 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 1 +
ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
index bebbecc..ea511e4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -413,7 +413,8 @@
AjaxResult ajaxResult = null;
try {
// ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
- ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
+// ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
+ ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);
} catch (Exception e) {
e.printStackTrace();
log.error(String.valueOf(e));
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
index d948703..514a502 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -113,6 +113,7 @@
"SELECT\n" +
" pro.pro_id,\n" +
" dep.dept_name,\n" +
+ " dep.dept_id,\n" +
" pro.pro_name,\n" +
" re.type,\n" +
" us.nick_name doctor_name,\n" +
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
index 2826b47..edd3dbd 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/vodomain/CsProVo.java
@@ -59,4 +59,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏈�鍚庝慨鏀规椂闂�")
private Date zhupdateTime;
+
+ private Long deptId;
}
--
Gitblit v1.8.0