From c63daceb66fbb7faa56849e695c07e28447818b9 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 29 四月 2025 14:18:46 +0800
Subject: [PATCH] pdf生成增加是否根据orderdetail结果字段判断 修复字体重叠问题 固定项目结论增加字符串去除null
---
ltkj-admin/src/main/java/com/ltkj/web/controller/api/DefaultController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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
index 399ea2e..56a0346 100644
--- 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
@@ -3,8 +3,11 @@
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.mapper.TjCustomerMapper;
+import com.ltkj.hosp.service.ITjOrderService;
import com.ltkj.web.controller.system.TjCheckController;
import com.ltkj.web.controller.system.TjReportController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -33,6 +37,8 @@
private TjCheckController tjCheckController;
@Autowired
private TjCustomerMapper tjCustomerMapper;
+ @Autowired
+ private ITjOrderService tjOrderService;
/**
* 鎻愪緵缁欎笁鏂硅皟鐢ㄧ殑鎶ュ憡鏌ョ湅鎺ュ彛
@@ -40,9 +46,16 @@
* @param json
*/
@PostMapping("/viewReport")
- public void viewReport(HttpServletResponse response, @RequestBody String json){
+ public void viewReport(HttpServletResponse response, @RequestBody String json) throws IOException {
JSONObject entries = JSONUtil.parseObj(json);
String tjNum = entries.getStr("tjNum");
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getHeshouStatus,1);
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ List<TjOrder> list = tjOrderService.list(wrapper);
+ if (list.isEmpty()){
+ return;
+ }
tjReportController.preview(response,true,tjNum);
}
@@ -54,6 +67,13 @@
@PostMapping("/reportData")
public AjaxResult reportData(@RequestBody String json){
String tjNum = JSONUtil.parseObj(json).getStr("tjNum");
+ LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjOrder::getHeshouStatus,1);
+ wrapper.eq(TjOrder::getTjNumber,tjNum);
+ List<TjOrder> list = tjOrderService.list(wrapper);
+ if (list.isEmpty()){
+ return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
+ }
JSONObject entries = JSONUtil.parseObj(tjCheckController.updateCheckType(tjNum));
removeNullFields(entries);
return JSONUtil.toBean(entries, AjaxResult.class);
--
Gitblit v1.8.0