From a2d12d52275c9fc34277d3e41c662a5ea9fb597f Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 10:11:44 +0800
Subject: [PATCH] 报告合并判断心电图和附件
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index bd6ff4f..ae5a863 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -7,6 +7,7 @@
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.extra.pinyin.PinyinUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.utils.SecurityUtils;
@@ -205,7 +206,7 @@
TjOrder order = orderService.getById(tjFlowingWater.getOrderId());
TjCustomer customer = customerService.getById(order.getUserId());
if (null != tjFlowingWater.getTjProIds() && tjFlowingWater.getTjProIds().length > 0) {
- tjFlowingWater.setWaterId(SecurityUtils.getUsername() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(customer.getCusName(), "").toUpperCase() + DateUtil.format(new Date(), "yyMMddHHmmssSSS"));
tjFlowingWater.setIsAddition("Y");
if (tjFlowingWaterService.save(tjFlowingWater)) {
//寮傛鍗曢」鏀惰垂鏄庣粏
@@ -498,8 +499,12 @@
tjRefundVo.setTjPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
tjRefundVo.setSex(String.valueOf(customer.getCusSex()));
tjRefundVo.setIdCard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
- if (null != order.getDictCompName())
- tjRefundVo.setTjComp(compService.getById(order.getFirmId()) != null ? compService.getById(order.getFirmId()).getCnName() : null);
+ if (null != order.getFirmId()){
+ DictComp byId = compService.getById(order.getFirmId());
+ if(null != byId){
+ tjRefundVo.setTjComp(byId.getCnName());
+ }
+ }
if (null != order.getTjType()) tjRefundVo.setTjType(order.getTjType());
TjFlowingWater one = tjFlowingWaterService.getOne(new LambdaQueryWrapper<TjFlowingWater>()
.eq(TjFlowingWater::getOrderId, order.getOrderId())
@@ -555,8 +560,10 @@
project.getProId());
String s = tjFlowingWaterService.getDiscount(OrderId);
if(null !=decimal){
- project.setProPrice(decimal.setScale(2));
- project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
+// project.setProPrice(decimal.setScale(2));
+ project.setProPrice(decimal);
+// project.setProOrdPrice(decimal.multiply(new BigDecimal(s)).setScale(2));
+ project.setProOrdPrice(decimal);
}else {
BigDecimal decimal1 = transitionService.getTbTransitionDxPriceAndOrdPrice(String.valueOf(order.getUserId()),project.getProId());
if(null !=decimal1){
--
Gitblit v1.8.0