From 07ace5ef7c3ddf0deb66249aae6468e96b4ae646 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 10 二月 2025 09:25:42 +0800
Subject: [PATCH] 20250210
---
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 10 ++++++++++
ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java | 3 ++-
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java | 4 ++--
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 82c2df8..158468f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1655,6 +1655,16 @@
return AjaxResult.error();
}
+ @GetMapping("/signOrderInfo")
+ public AjaxResult signOrderInfo(@RequestParam("tjNum") String tjNum){
+ List<Map<String, Object>> djdInfos = tjOrderService.selectDjdInfo(tjNum);
+ Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNum);
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("djd",djdInfos);
+ hashMap.put("user",userInfo);
+ return AjaxResult.success(hashMap);
+ }
+
// @Transactional
public void getAjaxResults(String cusIdcard) {
if (!"".equals(cusIdcard) && cusIdcard != null) {
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
index 97deb77..c00444e 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -116,7 +116,7 @@
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
- .antMatchers("/jmreport/**","/lis/**","/pacs/**","/callBack/**").anonymous()
+ .antMatchers("/jmreport/**","/lis/**","/pacs/**","/callBack/**","/hosp/order/signOrderInfo").anonymous()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
.and()
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
index 1d9e1fd..19f520b 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java
@@ -22,7 +22,8 @@
"/cus/package/projectListByPacId/**",
"/cus/hospital/getHospList",
"/lis/**","/api/His/**","/pacs/**",
- "/callBack/**"
+ "/callBack/**",
+ "/hosp/order/signOrderInfo"
});
}
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
index e9e0070..ac7f7f5 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java
@@ -234,9 +234,9 @@
@Select("SELECT \n" +
- " '1' AS xh, " +
+ " ROW_NUMBER() OVER (ORDER BY d.djd_num) AS xh, " +
" REPLACE(d.dept_name, '闂ㄨ瘖', '') AS ksmc,\n" +
- " d.official_web AS ksdz,\n" +
+ " ifnull(d.official_web,'') AS ksdz,\n" +
" e.tjxm,\n" +
" e.tjjg\n" +
"FROM sys_dept d\n" +
--
Gitblit v1.8.0