From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
index d4fda5e..76a89f0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -19,6 +19,7 @@
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
+import com.ltkj.hosp.vodomain.ShenGaoTiZhongVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
@@ -281,9 +282,13 @@
if (jyjgval.compareTo(min) < 0) {
// jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
jyjg = jyjg + " 鈫�";
+ hybgd.setYcbz("1");
} else if (jyjgval.compareTo(max) > 0) {
// jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
jyjg = jyjg + " 鈫�";
+ hybgd.setYcbz("1");
+ }else {
+ hybgd.setYcbz("0");
}
hybgd.setJyjg(jyjg);
} catch (Exception ignored) {}
@@ -334,7 +339,7 @@
@GetMapping("/getShenGaoTiZhong")
@ApiOperation(value = "灏忕▼搴�-浣撴鎶ュ憡鏌ヨ璇︽儏")
public AjaxResult getShenGaoTiZhong(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
- Map<String, Object> objectMap = new HashMap<>();
+// Map<String, Object> objectMap = new HashMap<>();
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjOrder::getTjNumber, tjNumber);
wq1.eq(TjOrder::getCheckStatus, 1);
@@ -343,7 +348,7 @@
return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
}
- List<Map<String, Object>> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
+ List<ShenGaoTiZhongVo> maps = detailService.getShenGaoTiZhongList(one.getTjNumber());
// if(null !=maps && maps.size()>0){
// for (Map<String, Object> map : maps) {
// if (map.get("") == null) {
@@ -373,7 +378,7 @@
// }
// }
// }
-
+ log.info("ltkj {}鐨勪綋妫�鎶ュ憡鏌ヨ璇︽儏"+maps,tjNumber);
return AjaxResult.success(maps);
}
@@ -437,9 +442,9 @@
final String substring = uuid.toString().substring(0, 5);
// String userId = SecurityUtils.getLoginUser().getUsername();
- PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
+ PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf");
//String filePath = one.getPath();
- String filePath = value + "\\" + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
+ String filePath = value + File.separator + substring + tjNumber + tjCustomer.getCusName() + "_浣撴鎶ュ憡.pdf";
File f = new File(filePath);
if (filePath.isEmpty()) {
System.out.println("鏂囦欢涓嶅瓨鍦紒");
--
Gitblit v1.8.0