zhaowenxuan
2025-02-05 a2fad24a020e2670780b1c076a660d05e278564e
20250205
4个文件已修改
24 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/jmreport/JimuController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-dev.yml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
}
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
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>
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);
}