From 0ac30edc41e90f4010dc9937222c159b381caf23 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期四, 27 六月 2024 10:47:14 +0800
Subject: [PATCH] zjh 本地 2024/06/27 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index f9779ba..9cc2433 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -366,13 +366,13 @@
// }
// }
// for (String baoGaoDan : baoGaoDans) {
-// Date dates = new Date();
+ Date dates = new Date();
Map<String,Object> map=new HashMap<>();
map.put("his_registration_id",order.getCardId());
map.put("ksbm","");
map.put("pationid","");
map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
- map.put("jsrq",DateUtil.format(DateUtil.endOfDay(order.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
+ map.put("jsrq",DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
map.put("pagecount",10);
map.put("page",1);
AjaxResult result = controller.Getlabreportinfo(map);
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 e911655..eda4563 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
@@ -354,7 +354,7 @@
Date finishTime = tjOrder.getFinishTime();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String ksrq = dateFormat.format(createTime);
- String jsrq = dateFormat.format(finishTime);
+ String jsrq = dateFormat.format(new Date());
HashMap<String, Object> params = new HashMap<>();
params.put("his_registration_id", hisRegistrationId);
params.put("ksbm", "");
--
Gitblit v1.8.0