From 331d513f2546feb17834c89ac40513b93cdfc514 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 19 二月 2025 16:49:24 +0800
Subject: [PATCH] 增加报告查询接口以及修改药品申请
---
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java | 2
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 94 +++++++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 23 ++++++-
ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java | 12 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 23 ++++++-
ltkj-framework/src/main/java/com/ltkj/framework/config/WebConfig.java | 4 +
6 files changed, 141 insertions(+), 17 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
new file mode 100644
index 0000000..52bda6b
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java
@@ -0,0 +1,94 @@
+package com.ltkj.web.controller.api;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.web.controller.system.TjCheckController;
+import com.ltkj.web.controller.system.TjReportController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Company: 瑗垮畨璺嘲绉戞妧鏈夐檺鍏徃
+ * @Author: zhaowenxuan
+ * @Date: 2025/2/18 10:59
+ */
+@RequestMapping("/api")
+@RestController
+public class DefaultController {
+
+ @Autowired
+ private TjReportController tjReportController;
+ @Autowired
+ private TjCheckController tjCheckController;
+
+ /**
+ * 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏌ョ湅鎺ュ彛
+ * @param response
+ * @param json
+ */
+ @PostMapping("/viewReport")
+ public void viewReport(HttpServletResponse response, @RequestBody String json){
+ JSONObject entries = JSONUtil.parseObj(json);
+ String tjNum = entries.getStr("tjNum");
+ tjReportController.preview(response,true,tjNum);
+ }
+
+ /**
+ * 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏁版嵁鎺ュ彛
+ * @param json
+ * @return
+ */
+ @PostMapping("/reportData")
+ public AjaxResult reportData(@RequestBody String json){
+ String tjNum = JSONUtil.parseObj(json).getStr("tjNum");
+ JSONObject entries = JSONUtil.parseObj(tjCheckController.updateCheckType(tjNum));
+ removeNullFields(entries);
+ return JSONUtil.toBean(entries, AjaxResult.class);
+ }
+
+ public static void removeNullFields(JSONObject jsonObject) {
+ ArrayList<String> strings = new ArrayList<>();
+ strings.add("orderId");
+ strings.add("updateTime");
+ strings.add("orderDetailId");
+ strings.add("flowingWaterId");
+ strings.add("createBy");
+ strings.add("deleted");
+ strings.add("createTime");
+ strings.add("updateBy");
+ strings.add("createId");
+ strings.add("prosId");
+ strings.add("params");
+
+ List<String> keysToRemove = new ArrayList<>();
+ jsonObject.forEach((key, value) -> {
+ if (strings.contains(key)) {
+ keysToRemove.add(key);
+ } else if (value == null) {
+ keysToRemove.add(key);
+ } else if (value instanceof JSONObject) {
+ removeNullFields((JSONObject) value);
+ } else if (value instanceof JSONArray) {
+ JSONArray jsonArray = (JSONArray) value;
+ for (Object arrayItem : jsonArray) {
+ if (arrayItem instanceof JSONObject) {
+ removeNullFields((JSONObject) arrayItem);
+ }
+ }
+ }
+ });
+ for (String key : keysToRemove) {
+ jsonObject.remove(key);
+ }
+ }
+
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 8afaf78..803af65 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -1330,12 +1330,25 @@
dto1.setSqysbm(ysbm);
dto1.setMzksbm(dept);
dto1.setSjrq(date);
- dto1.setCzybm(ysbm);
- dto1.setCzyksbm(dept);
- dto1.setCflxbm("A");
- dto1.setYfbm("1");
+ String yfbm = configService.selectConfigByKey("chufang_yfbm");
+ String mzzd = configService.selectConfigByKey("chufang_mzzd");
+ String czybm = configService.selectConfigByKey("chufang_czybm");
+ String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
+ String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+ if (czybm.equalsIgnoreCase("N"))
+ dto1.setCzybm(ysbm);
+ else dto1.setCzybm(czybm);
+ if (czyksbm.equalsIgnoreCase("N"))
+ dto1.setCzyksbm(dept);
+ else dto1.setCzyksbm(czyksbm);
+ dto1.setCflxbm(cflxbm);
+ if (yfbm.equalsIgnoreCase("N"))
+ dto1.setYfbm("1");
+ else dto1.setYfbm(yfbm);
dto1.setFyts("1");
- dto1.setMzzd("");
+ if (mzzd.equalsIgnoreCase("N"))
+ dto1.setMzzd("");
+ else dto1.setMzzd(mzzd);
dto1.setDetails(outpinmedicapplyDetilsDtos);
AjaxResult result = controller.Outpinmedicapply(dto1);
String result1 = getAjaxResult(result);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index 1d9ee4d..74ec827 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -2205,12 +2205,25 @@
dto1.setSqysbm(ysbm);
dto1.setMzksbm(dept);
dto1.setSjrq(date);
- dto1.setCzybm(ysbm);
- dto1.setCzyksbm(dept);
- dto1.setCflxbm("A");
- dto1.setYfbm("1");
+ String yfbm = configService.selectConfigByKey("chufang_yfbm");
+ String mzzd = configService.selectConfigByKey("chufang_mzzd");
+ String czybm = configService.selectConfigByKey("chufang_czybm");
+ String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
+ String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+ if (czybm.equalsIgnoreCase("N"))
+ dto1.setCzybm(ysbm);
+ else dto1.setCzybm(czybm);
+ if (czyksbm.equalsIgnoreCase("N"))
+ dto1.setCzyksbm(dept);
+ else dto1.setCzyksbm(dept);
+ dto1.setCflxbm(cflxbm);
+ if (yfbm.equalsIgnoreCase("N"))
+ dto1.setYfbm("1");
+ else dto1.setYfbm(yfbm);
dto1.setFyts("1");
- dto1.setMzzd("");
+ if (mzzd.equalsIgnoreCase("N"))
+ dto1.setMzzd("");
+ else dto1.setMzzd(mzzd);
dto1.setDetails(outpinmedicapplyDetilsDtos);
AjaxResult result = controller.Outpinmedicapply(dto1);
String result1 = getAjaxResult(result);
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java b/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
index 88623b0..588f5dd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/wxUtils/HttpClientUtils.java
@@ -133,7 +133,7 @@
return response.toString();
}
} catch (IOException e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
}
return null;
@@ -175,7 +175,7 @@
return response.toString();
}
} catch (IOException e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
}
return null;
@@ -366,7 +366,7 @@
long getEnd = System.currentTimeMillis();
System.out.println("=================鑾峰彇鍝嶅簲缁撴灉鑰楁椂锛�" + (getEnd - getStart) + "ms");
} catch (Exception e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
} finally {
try {
// 鍏抽棴杩炴帴,閲婃斁璧勬簮
@@ -426,7 +426,7 @@
entity = response.getEntity();
responseContent = EntityUtils.toString(entity, "UTF-8");
} catch (Exception e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
} finally {
try {
// 鍏抽棴杩炴帴,閲婃斁璧勬簮
@@ -465,7 +465,7 @@
entity = response.getEntity();
responseContent = EntityUtils.toString(entity, "UTF-8");
} catch (Exception e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
} finally {
try {
// 鍏抽棴杩炴帴,閲婃斁璧勬簮
@@ -565,7 +565,7 @@
return response.toString();
}
} catch (IOException e) {
- e.printStackTrace();
+ log.error(String.valueOf(e),e.getMessage());
}
return 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 c00444e..417cd73 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,6 +116,8 @@
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+ // 涓夋柟鍙皟鐢ㄦ帴鍙�
+ .antMatchers("/api/viewReport","/api/reportData").permitAll()
.antMatchers("/jmreport/**","/lis/**","/pacs/**","/callBack/**","/hosp/order/signOrderInfo").anonymous()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
.anyRequest().authenticated()
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 fa7ab2b..fa92f1a 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
@@ -33,7 +33,9 @@
"/cus/package/projectListByPacId/**",
"/cus/hospital/getHospList",
"/lis/**","/api/His/**","/pacs/**",
- "/callBack/**"
+ "/callBack/**",
+ "/api/viewReport",
+ "/api/reportData"
});
registry.addInterceptor(dbChangeInterceptor)
--
Gitblit v1.8.0