From a2fad24a020e2670780b1c076a660d05e278564e Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 05 二月 2025 18:05:34 +0800
Subject: [PATCH] 20250205
---
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java | 15 +++++++++++++++
ltkj-hosp/pom.xml | 2 +-
ltkj-admin/src/main/resources/application-dev.yml | 3 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java | 4 ++++
4 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
index f87b6f4..4409769 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java
@@ -1,6 +1,9 @@
package com.ltkj.web.jmreport;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.mapper.TestMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -10,11 +13,14 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
@@ -34,6 +40,8 @@
private static String CONFIG_PATH;
+ @Autowired
+ private TestMapper testMapper;
@Value ("${config.properties}")
public void setConfigPath(String path) {
@@ -100,4 +108,11 @@
// public int view(){
// return 1;
// }
+
+ @GetMapping("/getBingZhong")
+ public String getBingZhongInfo(@RequestParam("start") String start, @RequestParam("end") String end){
+ JSONObject object = JSONUtil.createObj();
+ object.putOpt("data",testMapper.getBingZhongInfo(start,end));
+ return JSONUtil.toJsonStr(object);
+ }
}
diff --git a/ltkj-admin/src/main/resources/application-dev.yml b/ltkj-admin/src/main/resources/application-dev.yml
index ad74c1b..beec389 100644
--- a/ltkj-admin/src/main/resources/application-dev.yml
+++ b/ltkj-admin/src/main/resources/application-dev.yml
@@ -253,3 +253,6 @@
config:
properties: D:\ltkjprojectconf\config.properties
path: D:\ltkjprojectconf
+logging:
+ level:
+ org.jeecg: debug
diff --git a/ltkj-hosp/pom.xml b/ltkj-hosp/pom.xml
index 1c4d722..b1af7c6 100644
--- a/ltkj-hosp/pom.xml
+++ b/ltkj-hosp/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
- <version>1.5.4</version>
+ <version>1.6.6</version>
</dependency>
</dependencies>
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
index 985986f..ce9e022 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -433,4 +433,8 @@
"FROM\n" +
" LTEMR.V_TJ_JCBGXX_NEWTJ a WHERE trim(a.HIS_ID)=#{tjNum}")
List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd1(String tjNum);
+
+ @DataSource(value = DataSourceType.MASTER)
+ @Select("call tj_bingzhongtongji(#{p_start,mode=IN},#{p_end,mode=IN})")
+ List<Map<String ,Object>> getBingZhongInfo(@Param("p_start") String start,@Param("p_end") String end);
}
--
Gitblit v1.8.0