From 8aea3ecc955f5c55024686375bc6b2fc3a989a35 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 03 七月 2024 15:44:32 +0800
Subject: [PATCH] zjh 2024/07/3-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 1 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 eac5ee5..07fe543 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
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,6 +15,8 @@
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
+import com.ltkj.hosp.sqlDomain.LtkjHybgd;
+import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import io.swagger.annotations.Api;
@@ -32,6 +35,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
+import java.math.BigDecimal;
import java.net.URL;
import java.util.*;
import java.util.stream.Collectors;
@@ -79,7 +83,10 @@
@Value("${path.filePath}")
private String value;
-
+ @Resource
+ private LtkjHybgdService ltkjHybgdService;
+ @Resource
+ private LtkjHysqdService ltkjHysqdService;
/**
* 灏忕▼搴忔煡璇綋妫�鎶ュ憡鍒楄〃
*/
@@ -166,6 +173,7 @@
TjCustomer customer = customerService.getOne(wq22);
LambdaQueryWrapper<TjOrderRemark> wqm = new LambdaQueryWrapper<>();
wqm.eq(TjOrderRemark::getTjNumber, tjNumber);
+ wqm.in(TjOrderRemark::getDeptId,"100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
List<TjOrderRemark> remarkList = remarkService.list(wqm);
List<Map<String, Object>> abnormalList = new ArrayList<>();
if (null != remarkList && remarkList.size() > 0) {
@@ -241,6 +249,55 @@
return AjaxResult.success("璇ュ鎴峰湪娌℃湁浣撴椤圭洰鏁版嵁锛�");
}
+ @GetMapping("/getHyReportByTjNumber")
+ @ApiOperation(value = "灏忕▼搴�-浣撴鍖栭獙鎶ュ憡鏌ヨ璇︽儏")
+ public AjaxResult getHyReportByTjNumber(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
+ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjOrder::getTjNumber, tjNumber);
+ wq1.eq(TjOrder::getCheckStatus, 1);
+ TjOrder one = orderService.getOne(wq1);
+ if (one == null) {
+ return AjaxResult.success("浣撴鏆傛湭瀹屾垚锛侊紒");
+ }
+ List<LtkjHysqd> hysqdList = ltkjHysqdService.getLtkjHysqdByTjh(one.getCardId());
+ if(null !=hysqdList && hysqdList.size()>0){
+ List<Map<String, Object>> list = new ArrayList<>();
+
+ for (LtkjHysqd hysqd : hysqdList) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("parent",hysqd.getXmmc());
+ List<LtkjHybgd> hybgdList = ltkjHybgdService.getJianYanBaoGaoDanList(hysqd.getTmh());
+ if(null !=hybgdList && hybgdList.size()>0){
+ for (LtkjHybgd hybgd : hybgdList) {
+ String jyjg = hybgd.getJyjg();
+ String fwz = hybgd.getFwz();
+ if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)){
+ try {
+ String[] fwzs = fwz.split("-");
+ BigDecimal min = new BigDecimal(fwzs[0]);
+ BigDecimal max = new BigDecimal(fwzs[1]);
+ BigDecimal jyjgval = new BigDecimal(jyjg);
+ // 姣旇緝妫�楠岀粨鏋滃拰鑼冨洿鍊�
+ if (jyjgval.compareTo(min) < 0) {
+ // jyjg 灏忎簬鑼冨洿鏈�灏忓�硷紝娣诲姞涓嬬澶�
+ jyjg = jyjg + " 鈫�";
+ } else if (jyjgval.compareTo(max) > 0) {
+ // jyjg 澶т簬鑼冨洿鏈�澶у�硷紝娣诲姞涓婄澶�
+ jyjg = jyjg + " 鈫�";
+ }
+ hybgd.setJyjg(jyjg);
+ } catch (Exception ignored) {}
+ }
+ }
+ }
+ map.put("sons",hybgdList);
+ list.add(map);
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.success("璇ュ鎴峰湪娌℃湁浣撴椤圭洰鏁版嵁锛�");
+ }
+
/**
* 灏忕▼搴忕偣鍑讳綋妫�鎶ュ憡鏌ヨ璇︽儏,鏄剧ず韬珮浣撻噸浣撻噸鎸囨暟鏀剁缉鍘嬭垝寮犲帇
--
Gitblit v1.8.0