From da7dd957342aa96b31f17e3d61792896e006d6e2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 28 七月 2025 17:38:32 +0800
Subject: [PATCH] zjh20250728-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 151 ++++++++++++++++++++++++++++++++------------------
1 files changed, 97 insertions(+), 54 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index d7fde73..3355e2d 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -14,6 +14,7 @@
import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysDept;
+import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
@@ -33,6 +34,7 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
+import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
@@ -49,6 +51,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -134,6 +137,10 @@
private ITjProAdvicerulesService tjProAdvicerulesService;
@Autowired
private TjOrderYcxmService ycxmService;
+ @Autowired
+ private TjReportController reportController;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
@GetMapping("/ceshicc")
@@ -1133,9 +1140,6 @@
/**
* 鏍规嵁浣撴璁㈠崟鍙疯幏鍙栦綋妫�璇︽儏淇℃伅鎺ュ彛
*
- * @param tjNumber
- * @param advice
- * @param checkStatus
* @return
*/
@PostMapping("/getTjdetailList")
@@ -1166,7 +1170,12 @@
if (StrUtil.isNotBlank(dto.getZhiyeJg()))
tjOrder.setZhiyeJg(dto.getZhiyeJg());
if (orderService.updateById(tjOrder)) {
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ AjaxResult pdf = reportController.toPdf(dto.getTjNumber());
+ if (!pdf.get("code").toString().equals("200") ) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触!");
+ }
+ return AjaxResult.success("瀹℃牳骞剁敓鎴愭姤鍛婃垚鍔�!");
}
return AjaxResult.error("鎿嶄綔澶辫触");
}
@@ -1409,60 +1418,88 @@
parent.put("", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
- for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
- String ckfw = tjOrderDetail.getStanId();
- if (null != ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
- ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
- }
- if (StrUtil.isNotBlank(ckfw)) {
- try {
- if (ckfw != null && ckfw.contains("-")) {
- Integer.parseInt(tjOrderDetail.getYcbz());
- String[] split = ckfw.split("-");
- BigDecimal min = new BigDecimal(split[0]);
- BigDecimal max = new BigDecimal(split[1]);
- String proResult = tjOrderDetail.getProResult();
- if (null != proResult) {
- BigDecimal jyjgval = new BigDecimal(proResult);
- if (jyjgval.compareTo(min) < 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if (jyjgval.compareTo(max) > 0) {
- tjOrderDetail.setYcbz("鈫�");
- } else if (proResult.contains("闃�")) {
- tjOrderDetail.setYcbz("");
+
+ Map<String, List<TjOrderDetail>> listMap = tjOrderDetails.stream()
+ .filter(i -> StrUtil.isNotBlank(i.getProResult()) && remark.getProsId().equals(i.getProsId()))
+ .collect(Collectors.groupingBy(TjOrderDetail::getProResult));
+// null !=dictList &&
+
+ boolean isGroupOnce = false;
+ String groupOnceProResult = "";
+ if (listMap.size() == 1){
+ String firstKey = listMap.keySet().stream().findFirst().orElse(null);
+ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SysDictData::getDictType,"qj_type");
+ wrapper.eq(SysDictData::getDictLabel,firstKey);
+ List<SysDictData> dictList = sysDictDataService.list(wrapper);
+ if (!dictList.isEmpty()) {
+ isGroupOnce = true;
+ groupOnceProResult = firstKey;
+ }
+ }
+ if (isGroupOnce){
+ TjOrderDetail tjOrderDetail = new TjOrderDetail();
+ tjOrderDetail.setProName(remark.getProName());
+ tjOrderDetail.setProResult(groupOnceProResult);
+ dels.add(tjOrderDetail);
+ }else{
+ for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
+ if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
+ String ckfw = tjOrderDetail.getStanId();
+ if (null != ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
+ ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
+ }
+ if (StrUtil.isNotBlank(ckfw)) {
+ try {
+ if (ckfw != null && ckfw.contains("-")) {
+ Integer.parseInt(tjOrderDetail.getYcbz());
+ String[] split = ckfw.split("-");
+ BigDecimal min = new BigDecimal(split[0]);
+ BigDecimal max = new BigDecimal(split[1]);
+ String proResult = tjOrderDetail.getProResult();
+ if (null != proResult) {
+ BigDecimal jyjgval = new BigDecimal(proResult);
+ if (jyjgval.compareTo(min) < 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (jyjgval.compareTo(max) > 0) {
+ tjOrderDetail.setYcbz("鈫�");
+ } else if (proResult.contains("闃�")) {
+ tjOrderDetail.setYcbz("");
+ } else {
+ tjOrderDetail.setYcbz("");
+ }
+ if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
+ }
} else {
tjOrderDetail.setYcbz("");
}
- if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
- tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
- }
} else {
- tjOrderDetail.setYcbz("");
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
+
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("鈫�");
}
- } else {
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
- tjOrderDetail.setYcbz("");
-
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
- tjOrderDetail.setYcbz("鈫�");
+ } catch (NumberFormatException ignored) {
}
- } catch (NumberFormatException ignored) {
+ } else {
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("");
+
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
+ tjOrderDetail.setYcbz("鈫�");
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult());
}
- } else {
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
- tjOrderDetail.setYcbz("");
- if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�"))
- tjOrderDetail.setYcbz("鈫�");
- tjOrderDetail.setProResult(tjOrderDetail.getProResult());
- }
-
- if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
- dels.add(tjOrderDetail);
+ if (remark.getOrgType().equals(tjOrderDetail.getOrgType())) {
+ dels.add(tjOrderDetail);
+ }
}
}
}
+
+
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
@@ -1569,19 +1606,25 @@
public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
try {
if (StrUtil.isNotBlank(tjNum)) {
+ List<Map<String, Object>> maps = new ArrayList<>();
TjOrder one = orderService.getOrderByTjNum(tjNum);
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
yichangxiangmu(tjNum);
- LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderYcxm::getTjh, tjNum);
- List<TjOrderYcxm> list = ycxmService.list(wq);
- if (null != list && !list.isEmpty()) {
- Collections.reverse(list);
- return getOrderYcxmList(list);
- } else {
+ List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNum);
+ if(null!=tjOrderYcxmList&&!tjOrderYcxmList.isEmpty()){
+ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderYcxm::getTjh, tjNum);
+ List<TjOrderYcxm> list = ycxmService.list(wq);
+ if (null != list && !list.isEmpty()) {
+ Collections.reverse(list);
+ return getOrderYcxmList(list);
+ } else {
+ return AjaxResult.success(maps);
+ }
+ }else {
return zongjianyishengchakanyichangxiangmu(tjNum);
}
}
--
Gitblit v1.8.0