From dc9f340fa83555c30655a0e42c175a91d81d65d2 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 25 三月 2025 18:24:03 +0800
Subject: [PATCH] zjh20250325
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2466 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 1,909 insertions(+), 557 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 3b21af4..1ac6726 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -12,6 +12,7 @@
import java.util.*;
import java.util.List;
import java.util.concurrent.*;
+import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
@@ -20,7 +21,11 @@
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -29,25 +34,32 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.BeanProperty;
import com.itextpdf.text.Document;
import com.itextpdf.text.DocumentException;
+import com.ltkj.common.annotation.RepeatSubmit;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
-import com.ltkj.common.utils.PDFDocumentUtil;
-import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.common.utils.*;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.config.ThreadPoolConfig;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.QianDaoDto;
+import com.ltkj.hosp.dto.TjProBlDto;
+import com.ltkj.hosp.dto.UpdateTransitionnewPriceDto;
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
+import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
+import com.ltkj.hosp.mapper.TbTransitionMapper;
import com.ltkj.hosp.mapper.TestMapper;
+import com.ltkj.hosp.mapper.TjSamplingMapper;
+import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
@@ -62,23 +74,28 @@
import com.ltkj.mall.mallOrderUtils.TjConstants;
import com.ltkj.mall.service.IMallCheckLogService;
import com.ltkj.mall.service.IMallOrderService;
-import com.ltkj.system.service.ISysConfigService;
-import com.ltkj.system.service.ISysDeptService;
-import com.ltkj.system.service.ISysUserService;
-import com.ltkj.web.controller.his.HisApiGetMethodService;
-import com.ltkj.web.controller.his.HisApiMethod;
-import com.ltkj.web.controller.his.HisApiMethodService;
-import com.ltkj.web.controller.his.HisMzJysqController;
+import com.ltkj.system.domain.TjDjdDyjl;
+import com.ltkj.system.service.*;
+import com.ltkj.web.controller.his.*;
+import com.ltkj.web.controller.lis.LisApiMethod;
+import com.ltkj.web.controller.pacs.PacsApiMethodService;
+import com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
+import com.ltkj.web.wxUtils.HttpClientUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.HttpRequest;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.DigestUtils;
@@ -90,6 +107,8 @@
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
+import static com.ltkj.web.config.pdfutils.PDFBinaryUtil.getPDFBinary;
+
/**
* 浣撴璁板綍Controller
*
@@ -98,7 +117,7 @@
*/
@RestController
@RequestMapping("/hosp/order")
-@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛")
+@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛 OrderController")
@Slf4j
public class TjOrderController extends BaseController {
@Resource
@@ -131,67 +150,109 @@
private TjAsyncService asyncService;
@Resource
private ISysUserService userService;
-
@Resource
private RedisCache redisCache;
@Autowired
private ITjReportPrintService tjReportPrintService;
-
@Resource
private ITjPrintOrderService printOrderService;
-
@Resource
private IJimuOnlineReportService reportService;
-
@Resource
private ITjSurveyRecordService surveyRecordService;
-
@Autowired
private IMallOrderService mallOrderService;
@Autowired
private IMallCheckLogService mallCheckLogService;
@Resource
private ITjDwDeptService dwDeptService;
-
@Resource
private ITjDwGroupingService dwGroupingService;
-
@Resource
private ITjOrderDetailRulesService orderDetailRulesService;
-
@Resource
private ITjRulesService rulesService;
-
@Autowired
private ITjAskMedicalHistoryService tjAskMedicalHistoryService;
-
@Autowired
private ITjReportGetAddressService tjReportGetAddressService;
-
@Resource
private TestMapper testMapper;
-
@Resource
private LtkjMiddleDetailService middleDetailService;
-
@Resource
private LtkjMiddleHeadService headService;
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
@Autowired
private ThreadPoolConfig threadPoolConfig;
-
@Autowired
private HisApiMethod hisApiMethod;
-
- @Autowired
- private HisMzJysqController hisMzJysqController;
@Autowired
private HisApiGetMethodService hisApiGetMethodService;
@Autowired
private ISysDeptService sysDeptService;
@Autowired
private HisApiMethodService controller;
+ @Autowired
+ private TjProBlService blService;
+ @Resource
+ private ITjReportTemplateService reportTemplateService;
+ @Autowired
+ private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;
+ @Autowired
+ private PacsApiMethodService pacsApiMethodService;
+ @Autowired
+ private ITbTransitionService tbTransitionService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
+ @Autowired
+ private TjCfService cfService;
+ @Autowired
+ private TjReportController reportController;
+ @Resource
+ private ITjReportService tjReportService;
+ @Autowired
+ private HisPDFUtil hisPDFUtil;
+ @Value("${path.reportServer}")
+ private String urlValue;
+ @Autowired
+ private ITjSamplingService samplingService;
+ @Autowired
+ private TjSamplingMapper tjSamplingMapper;
+ @Autowired
+ private ITjGroupingProService groupingProService;
+ @Autowired
+ private ITjDjdDyjlService djdDyjlService;
+ @Autowired
+ private IdUtils idUtils;
+ @Autowired
+ private LtkjJybbzdService jybbzdService;
+ @Autowired
+ private LisJyflhbService lisJyflhbService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+ @Autowired
+ private TjFlowingWaterHisService tjFlowingWaterHisService;
+ @Resource
+ private ITjXdPictureService xdPictureService;
+ @Autowired
+ private TjOrderYcxmService ycxmService;
+ @Autowired
+ private TbTransitionMapper tbTransitionMapper;
+
+ private static final String TJH = "tjhs:tjh";
+
+ //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
+ public JSONObject getJSONObject(String builder) {
+ String Response = JSONUtil.parseObj(builder).getStr("Response");
+ return JSONUtil.parseObj(Response);
+ }
+
+ //鑾峰彇鏂规硶杩斿洖鍊间俊鎭�
+ public String getAjaxResult(AjaxResult result) {
+ return result.get("data").toString();
+ }
/**
* 鏌ヨ浣撴璁板綍鍒楄〃
@@ -247,7 +308,7 @@
wqq.like(TjCustomer::getCusName, name);
List<TjCustomer> customerList = tjCustomerService.list(wqq);
List<TjOrder> list2 = new ArrayList<>();
- if (null != customerList && customerList.size() > 0) {
+ if (null != customerList && !customerList.isEmpty()) {
List<TjOrder> list = new ArrayList<>();
for (TjCustomer customer : customerList) {
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
@@ -258,13 +319,13 @@
list.addAll(tjOrderService.list(wq));
}
List<TjOrder> collect = null;
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
for (TjOrder order : list) {
//绛涢�夋湁璋冩煡闂嵎鐨�
LambdaQueryWrapper<TjSurveyRecord> wqq1 = new LambdaQueryWrapper<>();
wqq1.eq(TjSurveyRecord::getTjnumber, order.getTjNumber());
List<TjSurveyRecord> one = surveyRecordService.list(wqq1);
- if (one.size() == 0) {
+ if (one.isEmpty()) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
@@ -325,7 +386,7 @@
LambdaQueryWrapper<TjSurveyRecord> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjSurveyRecord::getTjnumber, order.getTjNumber());
List<TjSurveyRecord> one = surveyRecordService.list(wqq);
- if (one.size() == 0) {
+ if (one.isEmpty()) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
@@ -364,70 +425,23 @@
@ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
public AjaxResult getOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "鐘舵��") @RequestParam(required = false) Integer zt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "椤圭洰鍚�)") @RequestParam(required = false) String xmmc,
@ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime,
@ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime,
@ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+ @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime,
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw) {
Map<String, Object> map = new HashMap<>();
+ List<Long> cusIds = null;
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
- List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && customerList.size() > 0) {
- List<TjOrder> list = new ArrayList<>();
- for (TjCustomer customer : customerList) {
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- if (null != djbeginTime && null != djendTime) {
- wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
- }
- wq.eq(TjOrder::getUserId, customer.getCusId());
- list.addAll(tjOrderService.list(wq));
- }
- List<TjOrder> collect = null;
- if (list.size() > 0) {
- for (TjOrder order : list) {
- TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
- if (null != tjCustomer) {
-// order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- order.setTjCustomerName(tjCustomer.getCusName());
-// order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- order.setTjCustomerPhone(tjCustomer.getCusPhone());
-// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
- order.setTjCusIdCard(tjCustomer.getCusIdcard());
- order.setTjCustomerSex(tjCustomer.getCusSex());
- order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- order.setCareer(tjCustomer.getCareer());
- order.setIdType(tjCustomer.getIdType());
- order.setAgeUnit(tjCustomer.getAgeUnit());
- order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
- }
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
- }
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
- }
- }
- }
- collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- if (null != collect) {
- map.put("total", collect.size());
- } else {
- map.put("total", 0);
- }
- map.put("list", collect);
- return AjaxResult.success(map);
- }
-
+ cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
}
+
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
if (null != djbeginTime && null != djendTime) {
@@ -439,6 +453,110 @@
if (null != tjNum) {
wq.eq(TjOrder::getTjNumber, tjNum);
}
+
+
+ if (null != xmmc) {
+ wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc));
+ }
+
+ if (StrUtil.isNotBlank(dw)) {
+ wq.like(TjOrder::getFirmName, dw);
+ }
+
+ if (null != cusIds && !cusIds.isEmpty()) {
+ wq.in(TjOrder::getUserId, cusIds);
+ }
+
+ if (null != zt && (zt == 0 || zt == 1 || zt == 2)) {
+ List<TjOrder> orders = new ArrayList<>();
+ List<TjOrder> tjOrders = null;
+ List<TjOrder> orderList = tjOrderService.list(wq);
+ if (null != orderList && !orderList.isEmpty()) {
+ for (TjOrder order : orderList) {
+ int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+ int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+ if (zt == 0 && czwj == 0) {
+ //鏈0
+ order.setZt("鏈");
+ orders.add(order);
+ }
+ if (zt == 1 && czwj > 0) {
+ //鍦ㄦ1
+ order.setZt("鍦ㄦ");
+ orders.add(order);
+ }
+ if (zt == 2 && sfwc == 0 && order.getCheckStatus() == 0 && order.getCheckTime() == null && order.getHeshouStatus() == 0 && order.getPrintLastTime() == null) {
+ //宸插畬鎴�2
+ order.setZt("宸插畬鎴�");
+ orders.add(order);
+ }
+ }
+ if (!orders.isEmpty()) {
+ tjOrders = orders.stream().sorted(Comparator.comparing(TjOrder::getCreateTime).reversed())
+ .skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ for (TjOrder order : tjOrders) {
+ TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
+ if (null != tjCustomer) {
+ order.setTjCustomerSex(tjCustomer.getCusSex());
+ order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+ order.setTjCustomerName(tjCustomer.getCusName());
+ order.setTjCustomerPhone(tjCustomer.getCusPhone());
+ order.setTjCusIdCard(tjCustomer.getCusIdcard());
+ order.setCareer(tjCustomer.getCareer());
+ order.setIdType(tjCustomer.getIdType());
+ order.setAgeUnit(tjCustomer.getAgeUnit());
+ order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
+ String firmName = order.getFirmName();
+ if (StringUtil.isNotBlank(firmName)) {
+ order.setDictCompName(firmName);
+ }
+ if (null != order.getPacId()) {
+ if (null != tjPackageService.getById(order.getPacId())) {
+ order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ } else if (null != dwDeptService.getById(order.getPacId())) {
+ order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ }
+ }
+ TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+ if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
+ }
+ }
+ }
+ }
+ map.put("list", tjOrders);
+ map.put("total", orders.size());
+ return AjaxResult.success(map);
+ }
+
+ if (null != zt) {
+ if (zt == 3) {
+ //宸插鏍�
+ wq.isNotNull(TjOrder::getCheckTime);
+ wq.eq(TjOrder::getCheckStatus, 1);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus, 0);
+ }
+ if (zt == 4) {
+ //鐢熸垚鎶ュ憡
+ wq.isNotNull(TjOrder::getReportTime);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus, 0);
+ }
+ if (zt == 5) {
+ //鎶ュ憡鏍告敹
+ wq.eq(TjOrder::getHeshouStatus, 1);
+ wq.isNull(TjOrder::getPrintLastTime);
+ }
+ if (zt == 6) {
+ //宸叉墦鍗�
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus, 1);
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
+ }
+
wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
List<TjOrder> list = page2.getRecords();
@@ -450,23 +568,77 @@
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerPhone(tjCustomer.getCusPhone());
-// order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
order.setTjCusIdCard(tjCustomer.getCusIdcard());
order.setCareer(tjCustomer.getCareer());
order.setIdType(tjCustomer.getIdType());
order.setAgeUnit(tjCustomer.getAgeUnit());
order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
- }
- String firmId = order.getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
- order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
- }
- if (null != order.getPacId()) {
- if (null != tjPackageService.getById(order.getPacId())) {
- order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ if (null != tjCustomer.getCompName()) {
+ order.setDictCompName(tjCustomer.getCompName());
+ } else {
+ String firmId = order.getFirmId();
+ if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
+ order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
+ }
}
- if (null != dwDeptService.getById(order.getPacId())) {
- order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ if (null != order.getPacId()) {
+ if (null != tjPackageService.getById(order.getPacId())) {
+ order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+ } else if (null != dwDeptService.getById(order.getPacId())) {
+ order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+ }
+ }
+ TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+ if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
+ }
+ int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+ int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+ Date checkTime = order.getCheckTime();
+ Date reportTime = order.getReportTime();
+ Integer heshouStatus = order.getHeshouStatus();
+ Date lastTime = order.getPrintLastTime();
+
+ if (null != zt) {
+ if (zt == 3) {
+ order.setZt("宸插鏍�");
+ }
+ if (zt == 4) {
+ order.setZt("鐢熸垚鎶ュ憡");
+ }
+ if (zt == 5) {
+ order.setZt("鎶ュ憡鏍告敹");
+ }
+ if (zt == 6) {
+ order.setZt("宸叉墦鍗�");
+ }
+ } else {
+ if (czwj == 0) {
+ //鏈0
+ order.setZt("鏈");
+ }
+ if (czwj > 0) {
+ //鍦ㄦ1
+ order.setZt("鍦ㄦ");
+ }
+ if (sfwc == 0) {
+ //宸插畬鎴�2
+ order.setZt("宸插畬鎴�");
+ }
+ if (null != checkTime) {
+ //宸插鏍�3
+ order.setZt("宸插鏍�");
+ }
+ if (null != reportTime) {
+ //鐢熸垚鎶ュ憡4
+ order.setZt("鐢熸垚鎶ュ憡");
+ }
+ if (1 == heshouStatus) {
+ //鎶ュ憡鏍告敹5
+ order.setZt("鎶ュ憡鏍告敹");
+ }
+ if (null != lastTime) {
+ //宸叉墦鍗�6
+ order.setZt("宸叉墦鍗�");
}
}
}
@@ -481,85 +653,41 @@
@ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(required = false) Integer dyzt,
@ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
@ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
- @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
- @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
- Map<String, Object> map = new HashMap<>();
- if (null != name) {
+ @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
+ @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
+ @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
+ /* Map<String, Object> map = new HashMap<>();
+ List<Long> cusIds = null;
+ if (StringUtil.isNotBlank(name)) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
wqq.like(TjCustomer::getCusName, name);
- List<TjCustomer> customerList = tjCustomerService.list(wqq);
- if (null != customerList && customerList.size() > 0) {
- List<TjOrder> list = new ArrayList<>();
- for (TjCustomer customer : customerList) {
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.isNotNull(TjOrder::getReportTime);
- wq.eq(TjOrder::getUserId, customer.getCusId());
- wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
- list.addAll(tjOrderService.list(wq));
- }
- List<TjOrder> collect = null;
- if (list.size() > 0) {
-
- for (int i = 0; i < list.size(); i++) {
- TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
- if (null == tjCustomer) {
- list.remove(list.get(i));
- continue;
- }
- list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
- list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
- list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
-
- String firmId = list.get(i).getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
- list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
- }
- if (null != list.get(i).getPacId()) {
- if (null != tjPackageService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(list.get(i).getPacId())) {
- list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
- }
- }
- //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
- LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
- wqqq.orderByDesc(TjReportPrint::getPrintTime);
- wqqq.last("limit 1");
- TjReportPrint one = tjReportPrintService.getOne(wqqq);
- if (one != null) {
- list.get(i).setPrintLastTime(one.getPrintTime());
- }
-
- }
- collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
- }
- if (null != collect) {
- map.put("total", collect.size());
- } else {
- map.put("total", 0);
- }
- map.put("list", collect);
- return AjaxResult.success(map);
- }
-
+ cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
}
Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- wq.isNotNull(TjOrder::getReportTime);
- wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
- if (null != bgbeginTime && null != bgendTime) {
- wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(bgbeginTime), DateUtil.endOfDay(bgendTime));
+ if (dyzt == 0) {
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
+ } else {
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ }
+
+ if (null != djbeginTime && null != djendTime) {
+ wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(DateUtil.parseDate(djbeginTime)), DateUtil.endOfDay(DateUtil.parseDate(djendTime)));
}
if (null != tjNum) {
- wq.eq(TjOrder::getTjNumber, tjNum);
+ wq.like(TjOrder::getTjNumber, tjNum);
}
- wq.orderByDesc(TjOrder::getReportTime);
+ if (StringUtil.isNotBlank(dw)) {
+ wq.like(TjOrder::getFirmName, dw);
+ }
+ if (null != cusIds && !cusIds.isEmpty()) {
+ wq.in(TjOrder::getUserId, cusIds);
+ }
+ wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
List<TjOrder> list = page2.getRecords();
if (list != null) {
@@ -571,15 +699,19 @@
}
list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
- list.get(i).setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
- list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+ list.get(i).setTjCustomerName(tjCustomer.getCusName());
+ list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
if (tjCustomer.getCusIdcard() != null) {
- list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+ list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
}
- String firmId = list.get(i).getFirmId();
- if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
- list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+ if (null != tjCustomer.getCompName()) {
+ list.get(i).setDictCompName(tjCustomer.getCompName());
+ } else {
+ String firmId = list.get(i).getFirmId();
+ if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
+ list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+ }
}
if (null != list.get(i).getPacId()) {
if (null != tjPackageService.getById(list.get(i).getPacId())) {
@@ -590,18 +722,22 @@
}
}
//浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
- LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
- wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
- wqqq.orderByDesc(TjReportPrint::getPrintTime);
- wqqq.last("limit 1");
- TjReportPrint one = tjReportPrintService.getOne(wqqq);
- if (one != null) {
- list.get(i).setPrintLastTime(one.getPrintTime());
- }
+// LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
+// wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
+// wqqq.orderByDesc(TjReportPrint::getPrintTime);
+// wqqq.last("limit 1");
+// TjReportPrint one = tjReportPrintService.getOne(wqqq);
+// if (one != null) {
+// list.get(i).setPrintLastTime(one.getPrintTime());
+// }
}
}
map.put("list", list);
- map.put("total", page2.getTotal());
+ map.put("total", page2.getTotal());*/
+
+ if (djbeginTime == null) djbeginTime = "";
+ if (djendTime == null) djendTime = "";
+ Map<String, Object> map = tjOrderService.getTjBgdyList(pageNum, pageSize, dyzt, tjNum, name, dw, djbeginTime, djendTime);
return AjaxResult.success(map);
}
@@ -842,9 +978,14 @@
/**
* 浣撴绛惧埌鐧昏鎺ュ彛
*/
+
+
+ ReentrantLock lock = new ReentrantLock();
+
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
- @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+// @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+ @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
public AjaxResult addOrderAndDetail(@RequestBody TjOrder tjOrder) throws Exception {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -854,20 +995,19 @@
TjCustomer tjCustomer = tjCustomerService.getOne(wq);
if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏");
- LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
- wqq.eq(TjOrder::getCheckStatus, 0);
- wqq.isNull(TjOrder::getFinishTime);
-// if (!tjCustomer.getCardId().equals("0")) {
- wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+// LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
+// wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
+// wqq.eq(TjOrder::getCheckStatus, 0);
+// wqq.isNull(TjOrder::getFinishTime);
+//// if (!tjCustomer.getCardId().equals("0")) {
+// wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+//// }
+// TjOrder order = tjOrderService.getOne(wqq);
+// if (null != order) {
+// transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
+// return AjaxResult.error("涓嶅彲閲嶅鐧昏");
// }
- TjOrder order = tjOrderService.getOne(wqq);
- if (null != order) {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
- return AjaxResult.error("涓嶅彲閲嶅鐧昏");
- }
-
-
+ TjFlowingWater tjFlowingWater = new TjFlowingWater();
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -876,16 +1016,17 @@
if (null != tjReservation) {
tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
- return AjaxResult.error("鏈埌棰勭害鏃堕棿");
- }
- if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
+ // if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+ // return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+ // }
+ if (DateUtil.endOfDay(DateUtil.offsetDay(tjReservation.getReservationTime(), tjReservation.getYxts())).before(new Date())) {
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}
if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+ if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany());
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
@@ -894,18 +1035,18 @@
tjOrder.setGroupId(tjReservation.getGroupingId());
tjOrder.setFirmDeptId(tjReservation.getPacId());
}
-// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
if (null != tjReservation.getTeamNo()) {
tjOrder.setTjType("1");
- } else {
+ } else if (tjOrder.getTjType().equals("2")) {
tjOrder.setTjType("2");
}
}
- //鐢熸垚浣撴鍙�
- String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
- tjOrder.setTjNumber(tjNumber);
+ if (StringUtil.isBlank(tjOrder.getFirmId())) {
+ tjOrder.setFirmId("0");
+ }
+
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
if (file.isFile()) {
@@ -918,9 +1059,8 @@
tjOrder.setPhoto(encode);
}
}
- if (tjOrder.getFirmId() == null) {
- tjOrder.setFirmId("0");
- }
+
+
if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
}
@@ -928,13 +1068,56 @@
if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
- if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
tjOrder.setFinishTime(new Date());
tjOrder.setCheckStatus(1);
tjOrder.setStatus(TjConstants.TJ_WAIT);
+ // tjFlowingWater.setPayStasus(1L);
}
- if (tjOrderService.save(tjOrder)) {
+ tjFlowingWater.setPayStasus(0L);
+ try {
+ boolean b = lock.tryLock(3, TimeUnit.MINUTES);
+ if (b) {
+ AjaxResult result = processOrderWithTransaction(tjOrder, tjCustomer, tjReservation, tjFlowingWater, mallOrder, sysUser);
+ if (!result.get("code").toString().equals("200"))
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber());
+ return result;
+ }
+ }catch (Exception e){
+ log.error(String.valueOf(e));
+ }
+ finally {
+ lock.unlock();
+ }
+ return AjaxResult.error();
+ }
+
+ @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
+ public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
+
+ //鑾峰彇鎷兼帴鍓嶇紑
+ String sfkqtjhqz = configService.selectConfigByKey("sfkqtjhqz");
+ String makeLisTmhPrefix = "";
+ if(sfkqtjhqz.equalsIgnoreCase("Y")){
+ makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ }
+
+ //鐢熸垚浣撴鍙�
+// String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+// if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
+
+
+// String tjNumber = (SecurityUtils.getUsername() + idUtils.getTjNumber());
+ String tjNumber = idUtils.getTjNumber();
+ if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
+ tjOrder.setTjNumber(tjNumber);
+
+
+ BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
+ tjOrder.setDiscount(discount.toString());
+ if (tjOrderService.save(tjOrder)) {
//淇濆瓨鏀惰揣鍦板潃
if ("2".equals(tjOrder.getGetType())) {
final TjReportGetAddress address = tjOrder.getAddAddress();
@@ -946,9 +1129,7 @@
Long cusNumber = tjCustomer.getCusNumber();
cusNumber += 1;
tjCustomer.setCusNumber(cusNumber);
- BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
- TjFlowingWater tjFlowingWater = new TjFlowingWater();
- tjFlowingWater.setPayStasus(0L);
+
if ("1".equals(tjOrder.getTjType())) {
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjFlowingWater.setPayStasus(3L);
@@ -969,11 +1150,18 @@
Date date1 = new Date(System.currentTimeMillis());
String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+ BigDecimal copeWith = tjOrder.getTjFlowingWater().getCopeWith();
+ BigDecimal paidIn = tjOrder.getTjFlowingWater().getPaidIn();
+ tjFlowingWater.setCopeWith(copeWith);
+ tjFlowingWater.setPaidIn(paidIn);
+ tjFlowingWater.setDiscount(discount.toString());
- tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
- tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
- tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
+ BigDecimal subtract = paidIn.subtract(copeWith.multiply(discount.divide(BigDecimal.valueOf(10))));
+ log.info("绛惧埌鐧昏浣撴浜�: " + tjOrder.getTjNumber() + " 搴斾粯: " + copeWith);
+ log.info("绛惧埌鐧昏浣撴浜�: " + tjOrder.getTjNumber() + " 鎶樻墸: " + discount);
+ log.info("绛惧埌鐧昏浣撴浜�: " + tjOrder.getTjNumber() + " 瀹炰粯: " + paidIn);
+ log.info("绛惧埌鐧昏浣撴浜�: " + tjOrder.getTjNumber() + " 鐩稿樊: " + subtract);
if (isPay.equals("true")) {
if (null != mallOrder) {
@@ -1000,58 +1188,83 @@
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-// tjFlowingWater.setPayStasus(0L);
+ // tjFlowingWater.setPayStasus(0L);
}
}
+
+ //淇敼姣忛」鐨勫師浠风幇浠�
+// transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+ //淇敼涓存椂琛ㄤ綋妫�鍙�
+ transitionService.updateTbTransitionTjNumByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber());
+ //琛ュ樊浠�
+ /* if(subtract.compareTo(BigDecimal.ZERO)>0){
+ tjFlowingWater.setPaidIn(paidIn.add(subtract));
+ TbTransition onwTbTransition = transitionService.getOnwTbTransition(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
+ if(null !=onwTbTransition){
+ log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+"缁�: "+onwTbTransition.getParentProName()+" "+onwTbTransition.getNowPrice()
+ +" 琛ュ樊浠� "+subtract+" 鏈�缁堝緱 "+onwTbTransition.getNowPrice().add(subtract));
+ onwTbTransition.setNowPrice(onwTbTransition.getNowPrice().add(subtract));
+ transitionService.updateById(onwTbTransition);
+ }
+ }*/
+
if (tjFlowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
tjOrderService.updateById(tjOrder);
-
-
}
-
- //鍥綋
- if ("1".equals(tjOrder.getTjType())) {
- asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
- }
- //涓汉
- if ("2".equals(tjOrder.getTjType())) {
- //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- }
-
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
-// final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
-// if ("Y".equals(getInfoFromSqlData)){
-// List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
-// if (one!=null){
-// for (LtkjMiddleHead ltkjMiddleHead : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// headService.save(ltkjMiddleHead);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
-// if (detailList!=null){
-// for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-// middleDetailService.save(ltkjMiddleDetail);
-// DynamicDataSourceContextHolder.clearDataSourceType();
-// }
-// }
-// }
-//
-// }
-// }
-
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
if (null != config && config.equals("Y")) {
- AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
+ AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
if (!result.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ Object jzh = result.get("jzh");
+ if (null != jzh && null != jzh.toString()) {
+ hisApiMethod.ZfHisApiMethod(jzh.toString());
+ }
+ log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
}
+
+ log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
+ //鍥綋
+/* if ("1".equals(tjOrder.getTjType())) {
+// asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+ ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+ }*/
+ //涓汉
+ /* if ("2".equals(tjOrder.getTjType())) {
+ //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ }*/
+ // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+ if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ log.info("璋冪敤his寮�鍚� 杩涘叆涓嶆敹璐规柟娉� 璇ユ柟娉曟墽琛屽畬姣�");
+ } else {
+ log.info("璋冪敤his寮�鍚� 杩涘叆鏀惰垂鏂规硶 璇ヤ綋妫�浜哄憳涓嶆敹璐�:"+tjOrder.getTjNumber());
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
+ if (isUseMx.equalsIgnoreCase("Y"))
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ }
+ return AjaxResult.success(tjNumber);
} else {
tjCustomer.setCardId(tjOrder.getTjNumber());
tjCustomerService.updateById(tjCustomer);
@@ -1059,20 +1272,311 @@
tjOrder.setCardId(tjOrder.getTjNumber());
tjOrderService.updateById(tjOrder);
}
+
+ //鍥綋
+// if ("1".equals(tjOrder.getTjType())) {
+// ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+//// asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+// return AjaxResult.success(tjNumber);
+// }
+ //涓汉
+// if ("2".equals(tjOrder.getTjType())) {
+// //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+// newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+//
+// String s = configService.selectConfigByKey("is_request_common_his_api");
+// if (null != s && s.equals("Y")) {
+// String apiUrl = configService.selectConfigByKey("common_api_url");
+// String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+// HashMap<String, Object> map = new HashMap<>();
+// map.put("pationId", tjCustomer.getPationId());
+// map.put("cardId", tjCustomer.getHisJzkh());
+// map.put("tjNum", tjFlowingWater.getTjSerialNumber());
+// map.put("kaiDanKs", "7805");
+// // 鏀惰垂鏍囧織 1寰呭敭璐� 2寰呴��璐�
+// map.put("shouTuiStatus", "1");
+//
+// JSONArray array = JSONUtil.createArray();
+// LambdaQueryWrapper<TbTransition> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TbTransition::getTjNum, tjOrder.getTjNumber());
+// wrapper.eq(TbTransition::getCusId, tjCustomer.getCusIdcard());
+// wrapper.eq(TbTransition::getCardId, tjCustomer.getCardId());
+// wrapper.isNotNull(TbTransition::getOrdPrice);
+// wrapper.gt(TbTransition::getOrdPrice, 0);
+//
+// List<TbTransition> list = tbTransitionService.list(wrapper);
+// for (TbTransition transition : list) {
+// LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
+// wrapper1.eq(TjProject::getProId, transition.getProId());
+// TjProject project = projectService.getOne(wrapper1);
+//
+// LambdaQueryWrapper<SysDept> wrapper2 = new LambdaQueryWrapper<>();
+// wrapper2.eq(SysDept::getDeptId, project.getDeptId());
+// SysDept dept = sysDeptService.getOne(wrapper2);
+//
+// JSONObject obj = JSONUtil.createObj();
+// Integer sl = project.getSl();
+// BigDecimal danjia = transition.getOrdPrice();
+// BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
+// obj.putOpt("danJia", danjia);
+// obj.putOpt("jieSuanJe", allPrice);
+// obj.putOpt("shuliang", sl);
+// obj.putOpt("zhiXingKs", dept.getDeptId());
+// obj.putOpt("zhiXingKsMc", dept.getDeptName());
+// obj.putOpt("shouFeiXmId", project.getHisXmbm());
+// obj.putOpt("shouFeiXmMc", project.getHisXmmc());
+//
+//// obj.putOpt("zhiXingKs","7805");
+//// obj.putOpt("zhiXingKsMc","浣撴绉�");
+//// obj.putOpt("shouFeiXmId","4735346");
+//// obj.putOpt("shouFeiXmMc","浣撴璐�");
+// array.add(obj);
+// }
+// map.put("feiYongInfoList", array);
+//
+// String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
+// JSONObject object = JSONUtil.parseObj(post);
+// if (object.getInt("code") == 200) {
+// JSONObject data = object.getJSONObject("data");
+// tjFlowingWater.setHisWaterId(data.getStr("feiYongId"));
+// JSONArray mxList = data.getJSONArray("mxList");
+// if (mxList != null && !mxList.isEmpty()) {
+// List<TjFlowingWaterHis> his = mxList.toList(TjFlowingWaterHis.class);
+// tjFlowingWaterHisService.saveBatch(his);
+// }
+// tjFlowingWaterService.updateById(tjFlowingWater);
+// } else {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return AjaxResult.error();
+// }
+// }
+// return AjaxResult.success(tjNumber);
+// }
+
+ // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+
+ log.info("绛惧埌鐧昏鎺ュ彛璇ヤ汉鍛�: "+tjOrder.getTjNumber()+" 鐨勪綋妫�绫诲瀷鏄�:"+tjOrder.getTjType());
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ log.info(tjOrder.getTjNumber()+"绛惧埌鐧昏杩涘叆鏈敹璐规柟娉�");
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ log.info(tjOrder.getTjNumber()+"绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ return AjaxResult.success(tjNumber);
+ } else {
+ log.info(tjOrder.getTjNumber()+"else绛惧埌鐧昏杩涘叆鏀惰垂鏂规硶");
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
+ if (error != null) return error;
+// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+ }
+
return AjaxResult.success(tjNumber);
+// pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
+// return AjaxResult.success(tjNumber);
}
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
+ }
+
+ private AjaxResult isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
+ String s = configService.selectConfigByKey("is_request_common_his_api");
+ if (null != s && s.equals("Y")) {
+ String apiUrl = configService.selectConfigByKey("common_api_url");
+ String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("pationId", tjCustomer.getPationId());
+ map.put("cardId", tjCustomer.getHisJzkh());
+ map.put("tjNum", tjFlowingWater.getTjSerialNumber());
+ map.put("kaiDanKs", "7805");
+ // 鏀惰垂鏍囧織 1寰呭敭璐� 2寰呴��璐�
+ map.put("shouTuiStatus", "1");
+
+ JSONArray array = JSONUtil.createArray();
+ LambdaQueryWrapper<TbTransition> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TbTransition::getTjNum, tjOrder.getTjNumber());
+ wrapper.eq(TbTransition::getCusId, tjCustomer.getCusIdcard());
+ wrapper.eq(TbTransition::getCardId, tjCustomer.getCardId());
+ wrapper.isNotNull(TbTransition::getNowPrice);
+ wrapper.gt(TbTransition::getNowPrice, 0);
+
+ List<TbTransition> list = tbTransitionService.list(wrapper);
+ BigDecimal zongjia = new BigDecimal("0.0");
+ for (TbTransition transition : list) {
+ LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjProject::getProId, transition.getProId());
+ TjProject project = projectService.getOne(wrapper1);
+
+ LambdaQueryWrapper<SysDept> wrapper2 = new LambdaQueryWrapper<>();
+ wrapper2.eq(SysDept::getDeptId, project.getDeptId());
+ SysDept dept = sysDeptService.getOne(wrapper2);
+
+ JSONObject obj = JSONUtil.createObj();
+// Integer sl = project.getSl();
+ int sl = 1;
+ BigDecimal danjia = transition.getNowPrice();
+ BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
+ obj.putOpt("danJia", danjia);
+ obj.putOpt("jieSuanJe", allPrice);
+ obj.putOpt("shuliang", sl);
+ obj.putOpt("zhiXingKs", dept.getDeptId());
+ obj.putOpt("zhiXingKsMc", dept.getDeptName());
+ obj.putOpt("shouFeiXmId", project.getHisXmbm());
+ obj.putOpt("shouFeiXmMc", project.getHisXmmc());
+ array.add(obj);
+ zongjia = zongjia.add(allPrice);
+ }
+ map.put("feiYongInfoList", array);
+ log.info("璋冪敤His鎺ュ彛鍓� 鏀惰垂鎬讳环:{}", zongjia.toString());
+
+ String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
+ JSONObject object = JSONUtil.parseObj(post);
+ if (object.getInt("code") == 200) {
+ JSONObject data = object.getJSONObject("data");
+ tjFlowingWater.setHisWaterId(data.getStr("feiYongId"));
+ JSONArray mxList = data.getJSONArray("mxList");
+ if (mxList != null && !mxList.isEmpty()) {
+ List<TjFlowingWaterHis> his = mxList.toList(TjFlowingWaterHis.class);
+ tjFlowingWaterHisService.saveBatch(his);
+ }
+ tjFlowingWaterService.updateById(tjFlowingWater);
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error();
+ }
+ }
+ return null;
+ }
+
+ public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
+ String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ Boolean lisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+ if (null != detailList && detailList1) {
+ Date date = new Date();
+ String format = DateUtil.format(date, "yyMMddHHmmssSSS");
+ for (TjOrderDetail detail : detailList) {
+ TjSampling sampling = new TjSampling();
+ if (null == projectService.getById(detail.getProId())) continue;
+ TjProject project = projectService.getById(detail.getProId());
+ Long proParentId = project.getProParentId();
+ String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType());
+ if (null != proParentId && proParentId == 0) {
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
+ sampling.setSpecimenTypeCode(project.getSpecimenType());
+ sampling.setSpecimenType(dictLabel);
+ if (config.equals("Y") && lisAndPacsRegister)
+ sampling.setJyxmdm(project.getLisXmbm());
+ else sampling.setJyxmdm(project.getProId().toString());
+ } else {
+ TjProject project1 = projectService.getById(proParentId);
+ sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
+
+ sampling.setSpecimenTypeCode(project1.getSpecimenType());
+ sampling.setSpecimenType(dictLabel);
+ if (config.equals("Y") && lisAndPacsRegister)
+ sampling.setJyxmdm(project1.getLisXmbm());
+ else sampling.setJyxmdm(project1.getProId().toString());
+
+ }
+ sampling.setSamplingNumber(format);
+ sampling.setTjNum(order.getTjNumber());
+ sampling.setCusId(String.valueOf(order.getUserId()));
+ if (tjCustomerService.getById(String.valueOf(order.getUserId())) != null) {
+ sampling.setCusName(tjCustomerService.getById(String.valueOf(order.getUserId())).getCusName());
+ }
+ sampling.setApplicationTime(date);
+ sampling.setTjTime(order.getCreateTime());
+ sampling.setProId(String.valueOf(detail.getProId()));
+ sampling.setProName(projectService.getById(detail.getProId()).getProName());
+ sampling.setCreateBy(sysUser.getNickName());
+ sampling.setCreateTime(date);
+ sampling.setUpdateBy(sysUser.getNickName());
+ sampling.setUpdateTime(date);
+ sampling.setCreateId(String.valueOf(sysUser.getUserId()));
+ sampling.setUpdateId(String.valueOf(sysUser.getUserId()));
+ sampling.setJxbz(jxbz);
+ samplingService.save(sampling);
+ }
+ }
+ if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
+ AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
+ if (ajaxResult.get("code").toString().equals("200")) {
+ String str = ajaxResult.get("data").toString();
+ str = str.replace("=", ":");
+ JSONArray array = JSONUtil.parseArray(str);
+ for (Object o : array) {
+ JSONObject object = (JSONObject) o;
+ LisJyflhb lisJyflhb = new LisJyflhb();
+ lisJyflhb.setHbhxm(object.getStr("hbhxm"));
+ lisJyflhb.setFlmc(object.getStr("flmc"));
+ lisJyflhb.setMc(object.getStr("mc"));
+ lisJyflhb.setFlbm(object.getStr("flbm"));
+ LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
+ LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
+ if (jyflhb == null) {
+ lisJyflhb.setId(IdUtil.getSnowflake().nextId());
+ lisJyflhbService.save(lisJyflhb);
+ } else {
+ lisJyflhb.setId(jyflhb.getId());
+ lisJyflhbService.updateById(lisJyflhb);
+ }
+ }
+ }
+
+ }
+ if (StrUtil.isNotBlank(jxbz)) {
+ tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), jxbz);
+ } else {
+ tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+ }
+ }
+
+
+
+ @GetMapping("/addCaiYangDengJi")
+ @ApiOperation(value = "鎵嬪姩娣诲姞閲囨牱璁板綍鎺ュ彛")
+ public AjaxResult addCaiYangDengJi(@RequestParam("tjNum") String tjNum){
+
+ try {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if(null !=order){
+ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
+ SysUser sysUser = userService.getById(userId);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
+ log.info("绛惧埌鐧昏:閲囨牱鏁版嵁鏌ヨ涓暟"+detailList.size());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser, null);
+ }
+ } catch (NumberFormatException e) {
+ log.error(String.valueOf(e));
+ }
+
+ return AjaxResult.success();
}
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
- @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+// @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto, HttpServletResponse response) {
SysUser sysUser = UserHoder.getLoginUser().getUser();
List<String> cusIds = daoDto.getCusIds();
ArrayList<String> tjNumbers = new ArrayList<>();
- if (null != cusIds && cusIds.size() > 0) {
+ ArrayList<String> errTjh = new ArrayList<>();
+ if (null != cusIds && !cusIds.isEmpty()) {
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
threadPools.execute(new Runnable() {
@@ -1085,7 +1589,7 @@
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.in(TjCustomer::getCusIdcard, cusIds);
List<Long> list = tjCustomerService.list(wq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
// ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
ThreadPoolTaskExecutor executor = threadPoolConfig.threadPoolTaskExecutor();
for (Long aLong : list) {
@@ -1100,6 +1604,7 @@
// }
// }
// });
+
Future<AjaxResult> future = executor.submit(new Callable<AjaxResult>() {
@Override
public AjaxResult call() throws Exception {
@@ -1108,61 +1613,106 @@
});
try {
AjaxResult result = future.get();
- String tjNumber = result.get("tjNumber").toString();
- tjNumbers.add(tjNumber);
+ String code = result.get("code").toString();
+ if (code.equals("200")) {
+ String tjNumber = result.get("tjNumber").toString();
+ tjNumbers.add(tjNumber);
+ }else {
+ String userId = result.get("userId").toString();
+ errTjh.add(userId);
+ }
} catch (InterruptedException | ExecutionException e) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
}
}
threadPools.shutdown();
}
- }
- // TODO 鍥犱负鏈変綋妫�鍙蜂細鏌ュ嚭绌烘暟鎹� 鍏堜娇鐢ㄦ鏁版嵁
- tjNumbers = new ArrayList<>();
- tjNumbers.add("02095240229171627");
- tjNumbers.add("02095240229173104");
- tjNumbers.add("10001240524172002");
- tjNumbers.add("10001240304124410");
- tjNumbers.add("00325240304160123");
- tjNumbers.add("02095240304162044");
- tjNumbers.add("02095240304162152");
- tjNumbers.add("10001240304163505");
- Map<String, Object> map = null;
- try {
- map = PDFDocumentUtil.getDocument();
- Document document = (Document) map.get("document");
- for (int i = 0; i < tjNumbers.size(); i++) {
+ // TODO 鍥犱负鏈変綋妫�鍙蜂細鏌ュ嚭绌烘暟鎹� 鍏堜娇鐢ㄦ鏁版嵁 鎵撳嵃瀵艰瘖鍗�
+ if (!tjNumbers.isEmpty()) {
+ /* Map<String, Object> map = null;
try {
- List<Map<String, String>> djdInfos = tjOrderService.selectDjdInfo(tjNumbers.get(i));
- Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumbers.get(i));
- LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
- String time = null;
- if (tjsj != null) {
- time = dateFormat.format(tjsj);
+ map = PDFDocumentUtil.getDocument();
+ Document document = (Document) map.get("document");
+// for (int i = 0; i < tjNumbers.size(); i++) {
+ int i = 0;
+ for (String tjNumber : tjNumbers) {
+ try {
+ List<Map<String, Object>> djdInfos = tjOrderService.selectDjdInfo(tjNumber);
+ Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumber);
+ if(null !=userInfo && null !=djdInfos && !djdInfos.isEmpty()){
+ LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+ String time = null;
+ if (tjsj != null) {
+ time = dateFormat.format(tjsj);
+ }
+ PDFDocumentUtil.makeUserInfoTable(document, (String) userInfo.get("tjname"), (String) userInfo.get("sex")
+ , (String) userInfo.get("tjh"), (String) userInfo.get("lxdh"), (String) userInfo.get("tjname"), time);
+ PDFDocumentUtil.makeTjInfo(document, djdInfos);
+ // 澶氭潯鍒欐崲椤�
+ if (i + 1 < tjNumbers.size()) {
+ document.newPage();
+ }
+ }
+
+ } catch (DocumentException | IOException e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNumber);
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNumber);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+// transitionService.deletedTbTransitionByTjNum(tjNum);
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+
+ TjReservation reservation = tjReservationService.getById(order.getReservationId());
+ if(null !=reservation){
+ reservation.setIsExpire(2);
+ tjReservationService.updateById(reservation);
+ transitionService.updateTbTransitionByTjNum(tjNumber);
+ }
+ e.printStackTrace();
+ }
}
- PDFDocumentUtil.makeUserInfoTable(document, (String) userInfo.get("tjname"), (String) userInfo.get("sex")
- , (String) userInfo.get("tjh"), (String) userInfo.get("lxdh"), (String) userInfo.get("tjname"), time);
- PDFDocumentUtil.makeTjInfo(document, djdInfos);
- // 澶氭潯鍒欐崲椤�
- if (i + 1 < tjNumbers.size()) {
- document.newPage();
- }
- } catch (DocumentException | IOException e) {
+
+// }
+ document.close();
+ ByteArrayOutputStream outputStream = (ByteArrayOutputStream) map.get("stream");
+ String encodeToString = java.util.Base64.getEncoder().encodeToString(outputStream.toByteArray());
+ return AjaxResult.success().put("file", encodeToString);
+ } catch (IOException | DocumentException e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
e.printStackTrace();
- }
+ }*/
+ Map<String,Object> map=new HashMap<>();
+ map.put("tjh",tjNumbers);
+ return AjaxResult.success("鎿嶄綔鎴愬姛",map);
}
- document.close();
- ByteArrayOutputStream outputStream = (ByteArrayOutputStream) map.get("stream");
- String encodeToString = java.util.Base64.getEncoder().encodeToString(outputStream.toByteArray());
- return AjaxResult.success().put("file", encodeToString);
- } catch (IOException | DocumentException e) {
- e.printStackTrace();
+ if (!errTjh.isEmpty()){
+ Map<String,Object> map=new HashMap<>();
+ map.put("errtjh",errTjh);
+ return AjaxResult.success("浠ヤ笂浜哄憳绛惧埌澶辫触",map);
+ }
+ return AjaxResult.success();
}
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error();
}
- private void getAjaxResults(String cusIdcard) {
+ @GetMapping("/signOrderInfo")
+ public AjaxResult signOrderInfo(@RequestParam("tjNum") String tjNum){
+ List<Map<String, Object>> djdInfos = tjOrderService.selectDjdInfo(tjNum);
+ Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNum);
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("djd",djdInfos);
+ hashMap.put("user",userInfo);
+ return AjaxResult.success(hashMap);
+ }
+
+ @Transactional
+ public void getAjaxResults(String cusIdcard) {
if (!"".equals(cusIdcard) && cusIdcard != null) {
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -1296,25 +1846,13 @@
DynamicDataSourceContextHolder.clearDataSourceType();
}
- private AjaxResult getAjaxResult(Long userId, SysUser sysUser, String tjCategory) throws IOException {
+ @Transactional
+ public AjaxResult getAjaxResult(Long userId, SysUser sysUser, String tjCategory) throws IOException {
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusId, userId);
TjCustomer tjCustomer = tjCustomerService.getOne(wq);
if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
-
- LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TjOrder::getUserId, userId);
- wqq.eq(TjOrder::getCheckStatus, 0);
- wqq.isNull(TjOrder::getFinishTime);
- if (!tjCustomer.getCardId().equals("0")) {
- wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
- }
- TjOrder order = tjOrderService.getOne(wqq);
- if (null != order) {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
- return AjaxResult.error("涓嶅彲閲嶅鐧昏");
- }
TjOrder tjOrder = new TjOrder();
Date date = new Date();
tjOrder.setCreateTime(date);
@@ -1331,16 +1869,17 @@
if (tjReservation != null) {
tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
- if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
- return AjaxResult.error("鏈埌棰勭害鏃堕棿");
- }
- if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
- tjReservation.setIsExpire(1);
- tjReservationService.updateById(tjReservation);
- return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
- }
+// if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+// return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+// }
+// if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
+// tjReservation.setIsExpire(1);
+// tjReservationService.updateById(tjReservation);
+// return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
+// }
if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+ if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany());
if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
@@ -1351,12 +1890,47 @@
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
+ if (null != tjReservation.getTeamNo()) {
+ tjOrder.setTjType("1");
+ } else{
+ tjOrder.setTjType("2");
+ }
+
+ if (StringUtil.isBlank(tjOrder.getFirmId())) {
+ tjOrder.setFirmId("0");
+ }
+//
+// tjReservation.setIsExpire(1);
+// tjReservationService.updateById(tjReservation);
//鐢熸垚浣撴鍙�
- String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+// String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+// tjNumber = tjNumber.replaceAll(".{6}$", userId.toString().substring(userId.toString().length() - 6));
- tjNumber = tjNumber.replaceAll(".{4}$", userId.toString().substring(userId.toString().length() - 4));
+ //鑾峰彇鎷兼帴鍓嶇紑
+ String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+// String tjNumber = (sysUser.getUserName() + idUtils.getTjNumber());
+ String tjNumber = idUtils.getTjNumber();
+ if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
+
+
+// if (redisCache.hasKey(TJH)) {
+// while (true){
+// List<String> tjh = redisCache.getCacheList(TJH);
+// if(tjh.contains(tjNumber)){
+// tjNumber =(sysUser.getUserName() + IdUtils.getTjNumber());
+// if (StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber = makeLisTmhPrefix + tjNumber;
+// }else {
+// tjh.add(tjNumber);
+// }
+// }
+// }else {
+// List<String> stringList = tjOrderService.
+// list(new LambdaQueryWrapper<TjOrder>().select(TjOrder::getTjNumber)).stream().map(TjOrder::getTjNumber).collect(Collectors.toList());
+// stringList.add(tjNumber);
+// redisCache.setCacheList(TJH,stringList);
+// }
tjOrder.setTjNumber(tjNumber);
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
@@ -1397,6 +1971,21 @@
tjCustomer.setCusNumber(cusNumber);
// BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
TjFlowingWater tjFlowingWater = new TjFlowingWater();
+ tjFlowingWater.setCreateTime(date);
+ tjFlowingWater.setCreateTime(date);
+ tjFlowingWater.setUpdateTime(date);
+ tjFlowingWater.setCreateBy(sysUser.getNickName());
+ tjFlowingWater.setUpdateBy(sysUser.getNickName());
+// BigDecimal bigDecimal = tbTransitionMapper.sumTbTransitionOrdPriceByTjNum(tjOrder.getTjNumber());
+ BigDecimal bigDecimal = tbTransitionMapper.sumTbTransitionOrdPriceByTjNumIsNull(tjCustomer.getCusIdcard());
+ tjFlowingWater.setCopeWith(bigDecimal);
+// BigDecimal bigDecimal1 = tbTransitionMapper.sumTbTransitionNowPriceByTjNum(tjOrder.getTjNumber());
+ BigDecimal bigDecimal1 = tbTransitionMapper.sumTbTransitionNowPriceByTjNumIsNull(tjCustomer.getCusIdcard());
+ tjFlowingWater.setPaidIn(bigDecimal1);
+ tjFlowingWater.setDiscount(String.valueOf(10));
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(3L);
+
tjFlowingWater.setPayStasus(0L);
if ("1".equals(tjOrder.getTjType())) {
if (tjReservation.getPayType() == 1) {
@@ -1445,18 +2034,38 @@
if (tjFlowingWaterService.save(tjFlowingWater)) {
tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
tjOrderService.updateById(tjOrder);
-
-
}
- asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+ transitionService.updateTbTransitionTjNumByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber());
+ tjCustomer.setCardId(tjOrder.getTjNumber());
+ tjCustomerService.updateById(tjCustomer);
+ transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
+ tjOrder.setCardId(tjOrder.getTjNumber());
+ tjOrderService.updateById(tjOrder);
+// asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+
+ if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+ tjFlowingWater.setPayStasus(1L);
+ tjOrder.setTjFlowingWater(tjFlowingWater);
+ newSaveextracted(tjOrder, tjCustomer, BigDecimal.valueOf(10), sysUser, tjReservation, tjFlowingWater);
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+ addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+// return AjaxResult.success(tjNumber);
+ }
tjCustomer.setCardId("0");
tjCustomerService.updateById(tjCustomer);
return AjaxResult.success().put("tjNumber", tjNumber);
}
}
- return AjaxResult.error();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error().put("userId",userId);
}
@@ -1521,7 +2130,7 @@
if (null != tjCustomer) {
cardId = tjCustomer.getCardId();
}
- if ((null == proIds || proIds.size() == 0) && (null == packId || packId.equals(""))) {
+ if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
transitionService.deletedTbTransitionByCusId(cusId);
if (redisCache.hasKey(cardId + cusId)) {
redisCache.deleteObject(cardId + cusId);
@@ -1530,143 +2139,48 @@
redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
}
}
-// List<TbTransition> tbTransitionList = null;
-// if (!redisCache.hasKey(cardId + cusId)) {
-// tbTransitionList = new ArrayList<>();
-// } else {
-// tbTransitionList = redisCache.getCacheList(cardId + cusId);
-// }
- //濂楅
/*濂楅*/
if (null != packId && !packId.equals("")) {
Long pacId = Long.valueOf(packId.toString());
List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
- if (null == list || list.size() == 0) {
+ if (null == list || list.isEmpty()) {
transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
-// if (redisCache.hasKey(cardId + cusId + "cusId"))
-// redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
-// if (redisCache.hasKey(cardId + cusId)) {
-// tbTransitionList = new ArrayList<>();
-// redisCache.deleteObject(cardId + cusId);
-// }
List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
- if (null != ppList && ppList.size() > 0) {
- transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId);
- //寮傛淇濆瓨鏁版嵁搴�
-// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
-// asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null);
-// for (TjPackageProject tjPackageProject : ppList) {
-// TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
-// if (null != project) {
-//
-// BigDecimal divide = BigDecimal.valueOf(0);
-// if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
-// divide = BigDecimal.valueOf(0);
-// } else {
-// divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
-// }
-// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
-// if (null != tjProSonList && tjProSonList.size() > 0) {
-// //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
-// for (TjProject tjProject : tjProSonList) {
-// TbTransition tbTransition = new TbTransition();
-// tbTransition.setCusId(cusId);
-// tbTransition.setPacId(pacId);
-// if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
-// tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
-// tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
-// } else {
-// tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
-// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
-// }
-// tbTransition.setParentProId(project.getProId());
-// tbTransition.setParentProName(project.getProName());
-// tbTransition.setProId(tjProject.getProId());
-// tbTransition.setProName(tjProject.getProName());
-// tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName());
-// tbTransition.setProType(tjProject.getProType());
-// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
-// tbTransitionList.add(tbTransition);
-// }
-//
-// }
-// }
-// }
+ if (null != ppList && !ppList.isEmpty()) {
+ String string = transitionService.panduantaocanshifouchongfu(cusId, pacId);
+ if (!StringUtils.isBlank(string)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
+ }
+ transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
+
+ //琛ュ樊浠�
+ List<Map<String, Object>> cjMaps = transitionService.addTbhuoquxiangmuchajia(pacId.toString(), cusId);
+ if (null != cjMaps && !cjMaps.isEmpty()) {
+ log.info("璇ュ椁�"+pacId+"涓湁宸环:"+cjMaps.size()+"涓�");
+ for (Map<String, Object> cjMap : cjMaps) {
+ log.info("娣诲姞涓存椂琛ㄥ椁愭暟鎹椂鎵�閫夌殑宸环涓�:"+ cjMap.get("cj").toString());
+ transitionService.buxiangmuchajia(cusId, pacId.toString(), cjMap.get("xmid").toString(), new BigDecimal(cjMap.get("cj").toString()));
+ }
+ }
+
}
}
}
//鍗曢」
- if (null != proIds && proIds.size() > 0) {
+ if (null != proIds && !proIds.isEmpty()) {
//寮傛淇濆瓨鏁版嵁搴撹〃
-// asyncService.saveRedisTransitionByPacId(cusId, cardId, null, proIds);
for (Long proId : proIds) {
TjProject project = projectService.selectTjProjectByProId(proId);
- if(null !=project){ //&& (!project.getProName().contains("闈欒剦閲囪")|| !project.getProName().contains("璐�"))
+ if (null != project) {
List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
- if (null == transitionList || transitionList.size() == 0) {
- transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
+ if (null == transitionList || transitionList.isEmpty()) {
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
}
}
-// if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
}
-// for (Long proId : proIds) {
-// List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
-// if (null != transitions && transitions.size() > 0) {
-// continue;
-// }
-// TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId));
-// if (null != tjProject) {
-//// List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
-//// if (null != tjProSonList && tjProSonList.size() > 0) {
-//// for (TjProject tjProject : tjProSonList) {
-//// List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId()));
-//// if (null != transitionss && transitionss.size() > 0) {
-//// continue;
-//// }
-// TbTransition tbTransition = new TbTransition();
-// tbTransition.setCusId(cusId);
-// tbTransition.setPacId(null);
-// if (null != tjProject.getProPrice()) {
-// tbTransition.setOrdPrice(tjProject.getProPrice());
-// tbTransition.setNowPrice(tjProject.getProPrice());
-// } else {
-// tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
-// tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
-// }
-// tbTransition.setParentProId(tjProject.getProParentId());
-// if (tjProject.getProParentId() != null) {
-// TjProject byId = projectService.getById(tjProject.getProParentId());
-// if (null != byId) {
-// tbTransition.setParentProName(byId.getProName());
-// }
-// }
-// tbTransition.setParentProName("");
-//
-// tbTransition.setProId(tjProject.getProId());
-// tbTransition.setProName(tjProject.getProName());
-// tbTransition.setProType(tjProject.getProType());
-// tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
-// tbTransitionList.add(tbTransition);
-//// }
-//// }
-// }
-// }
}
-
-
-// if (null != tbTransitionList && tbTransitionList.size() > 0) {
-// if (redisCache.hasKey(cardId + cusId)) {
-// redisCache.deleteObject(cardId + cusId);
-// redisCache.setCacheList(cardId + cusId, tbTransitionList);
-// redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
-// } else {
-// redisCache.setCacheList(cardId + cusId, tbTransitionList);
-// redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
-// }
-// List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList);
-// return AjaxResult.success();
-// }
return AjaxResult.success();
}
@@ -1865,12 +2379,13 @@
}
}
}
+ remarkService.updateRemark(tjNumber);
asyncService.tjGoutAsync(domainVos, sysUser, list);
TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
customer.setCardId("0");
tjCustomerService.updateById(customer);
- String config = configService.selectConfigByKey("sfkqdyhis");
+ /* String config = configService.selectConfigByKey("sfkqdyhis");
if(null !=config && config.equals("Y")){
final String date = DateUtil.format(tjOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
OutpinimpapplyDto dto=new OutpinimpapplyDto();
@@ -1898,10 +2413,10 @@
dto.setSfqj("0");
dto.setJzqk(9);
controller.Outpinimpapply(dto);
- }
-
+ }*/
return AjaxResult.success("绛剧鎴愬姛锛�");
} else {
+ remarkService.updateRemark(tjNumber);
return getAjaxResult(tjNumber);
}
}
@@ -1960,11 +2475,7 @@
private List<Map<String, Object>> getMaps(String cusId, String cardId) {
List<TbTransition> transitionList = null;
-// if (redisCache.hasKey(cardId + cusId)) {
-// transitionList = redisCache.getCacheList(cardId + cusId);
-// } else {
transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
-// }
if (null == transitionList) return null;
Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
List<Map<String, Object>> list = new ArrayList<>();
@@ -1974,23 +2485,26 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
- map.put("tjCategory",aPackage.getTjCategory());
- map.put("pacName", aPackage.getPacName());
- TjProject tjProject = projectService.getById(entry.getKey());
-// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
-// .eq(TjPackageProject::getProId, entry.getKey()));
- map.put("ordPrice", tjProject.getProPrice());
-// if (null != project) {
-// map.put("nowPrice", project.getPriceNow());
-// } else {
-// map.put("nowPrice", tjProject.getProPrice());
-// }
- map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+ if (null != aPackage) {
+ map.put("tjCategory", aPackage.getTjCategory());
+ map.put("pacName", aPackage.getPacName());
+ TjProject tjProject = projectService.getById(entry.getKey());
+ map.put("ordPrice", tjProject.getProPrice());
+ map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+ } else {
+ TjDwGrouping grouping = dwGroupingService.getById(pacId);
+ map.put("tjCategory", null);
+ map.put("pacName", grouping.getGroupingName());
+ TjProject tjProject = projectService.getById(entry.getKey());
+ map.put("ordPrice", tjProject.getProPrice());
+ map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+ }
+
} else {
- map.put("tjCategory",null);
+ map.put("tjCategory", null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
- if (null != tbTransitionList && tbTransitionList.size() > 0) {
+ if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
BigDecimal money1 = new BigDecimal("0.00");
BigDecimal money2 = new BigDecimal("0.00");
for (TbTransition tbTransition : tbTransitionList) {
@@ -2026,7 +2540,7 @@
map.put("proPrantId", entry.getKey().toString());
if (null != pacId) {
TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
- map.put("tjCategory",aPackage.getTjCategory());
+ map.put("tjCategory", aPackage.getTjCategory());
map.put("pacName", aPackage.getPacName());
TjProject tjProject = projectService.getById(entry.getKey());
// TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -2037,9 +2551,9 @@
// } else {
// map.put("nowPrice", tjProject.getProPrice());
// }
- map.put("nowPrice",tjProject.getProPrice());
+ map.put("nowPrice", tjProject.getProPrice());
} else {
- map.put("tjCategory",null);
+ map.put("tjCategory", null);
map.put("pacName", "鍗曢」");
List<TbTransition> tbTransitionList = entry.getValue();
if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -2277,79 +2791,80 @@
@GetMapping("/getTransitionInfo")
@ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
- public AjaxResult getTransitionInfo(@RequestParam("tjNumber")String tjNumber){
+ public AjaxResult getTransitionInfo(@RequestParam("tjNumber") String tjNumber) {
QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
- wrapper.select("parent_pro_id","parent_pro_name","sum(ord_price) as ord_price")
- .eq("tj_num",tjNumber)
- .groupBy("parent_pro_name");
+ wrapper.select("parent_pro_id", "parent_pro_name", "sum(now_price) as ord_price")
+ .eq("tj_num", tjNumber)
+ .groupBy("parent_pro_id");
List<TbTransition> list = transitionService.list(wrapper);
List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList());
LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>();
- projectQueryWrapper.in(TjProject::getProId,parentProIds);
+ projectQueryWrapper.in(TjProject::getProId, parentProIds);
List<TjProject> projects = projectService.list(projectQueryWrapper);
JSONArray huiZong = JSONUtil.createArray();
int index = 1;
for (TjProject project : projects) {
LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SysDept::getDeptId,project.getDeptId());
+ queryWrapper.eq(SysDept::getDeptId, project.getDeptId());
SysDept dept = sysDeptService.getOne(queryWrapper);
for (TbTransition tbTransition : list) {
- if (tbTransition.getParentProId().toString().equals(project.getProId().toString())){
+ if (tbTransition.getParentProId().toString().equals(project.getProId().toString())) {
JSONObject obj = JSONUtil.createObj();
- obj.putOpt("index",index++);
- obj.putOpt("parent_pro_name",tbTransition.getParentProName());
- obj.putOpt("price",tbTransition.getOrdPrice());
- obj.putOpt("ks",dept.getDeptName());
+ obj.putOpt("index", index++);
+ obj.putOpt("parent_pro_name", tbTransition.getParentProName());
+ obj.putOpt("price", tbTransition.getOrdPrice());
+ obj.putOpt("ks", dept.getDeptName());
huiZong.add(obj);
}
}
}
wrapper = new QueryWrapper<>();
- wrapper.eq("tj_num",tjNumber);
+ wrapper.eq("tj_num", tjNumber);
list = transitionService.list(wrapper);
JSONArray info = JSONUtil.createArray();
index = 1;
for (TbTransition tbTransition : list) {
JSONObject obj = JSONUtil.createObj();
- obj.putOpt("index",index++);
- obj.putOpt("parent_pro_name",tbTransition.getParentProName());
- obj.putOpt("pro_name",tbTransition.getProName());
+ obj.putOpt("index", index++);
+ obj.putOpt("parent_pro_name", tbTransition.getParentProName());
+ obj.putOpt("pro_name", tbTransition.getProName());
BigDecimal ordPrice = tbTransition.getOrdPrice();
- obj.putOpt("zongjia",ordPrice);
+ obj.putOpt("zongjia", ordPrice);
QueryWrapper<TjProject> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("pro_id",tbTransition.getProId());
+ queryWrapper.eq("pro_id", tbTransition.getProId());
TjProject tjProject = projectService.getOne(queryWrapper);
Integer num = tjProject.getSl();
- obj.putOpt("num",num);
+ obj.putOpt("num", num);
BigDecimal price = ordPrice.divide(new BigDecimal(num));
- obj.putOpt("danjia",price);
+ obj.putOpt("danjia", price);
Date createTime = tbTransition.getCreateTime();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- obj.putOpt("time",dateFormat.format(createTime));
+ obj.putOpt("time", dateFormat.format(createTime));
info.put(obj);
}
HashMap<String, Object> map = new HashMap<>();
- map.put("huizong",huiZong);
- map.put("info",info);
- return AjaxResult.success().put("data",map);
+ map.put("huizong", huiZong);
+ map.put("info", info);
+ return AjaxResult.success().put("data", map);
}
+
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
- if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
- tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- }else {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- }
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
+ String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ } else {
+ tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+ }
- tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
- //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+
//娣诲姞remark琛ㄦ暟鎹�
- if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
- }else {
+ } else {
remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
}
@@ -2358,6 +2873,9 @@
if (null != tjReservation && tjReservation.getPayType() == 1) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
}
}
if (tjFlowingWater.getPayStasus() == 1L) {
@@ -2367,27 +2885,202 @@
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPayType(4L);
tjFlowingWaterService.updateById(tjFlowingWater);
- asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
}
-// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
- @PostMapping("/heXiaoByIds/{orderIds}")
+ public void ttextracted(TjOrder tjOrder, TjCustomer tjCustomer, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
+
+ tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
+ boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
+ String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+// if (!b) {
+// List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
+// if (null != proList && !proList.isEmpty()) {
+// for (TjGroupingPro groupingPro : proList) {
+// TjOrderDetail detail = new TjOrderDetail();
+// TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId()));
+// detail.setIsSampling(String.valueOf(tjProject.getIsSampling()));
+// detail.setOrderId(tjOrder.getOrderId());
+// detail.setProId(Long.valueOf(groupingPro.getProId()));
+// detail.setTjStatus(0L);
+// detail.setCreateBy(sysUser.getNickName());
+// detail.setCreateTime(new Date());
+// detail.setUpdateBy(sysUser.getNickName());
+// detail.setUpdateTime(new Date());
+// detail.setCreateId(String.valueOf(sysUser.getUserId()));
+// detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+// tjOrderDetailService.save(detail);
+// }
+// List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
+// List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list));
+// for (TjProject project : projectList) {
+// TjOrderDetail detail = new TjOrderDetail();
+// detail.setOrderId(tjOrder.getOrderId());
+// detail.setProId(project.getProId());
+// detail.setTjStatus(0L);
+// detail.setCreateBy(sysUser.getNickName());
+// detail.setCreateTime(new Date());
+// detail.setUpdateBy(sysUser.getNickName());
+// detail.setUpdateTime(new Date());
+// detail.setCreateId(String.valueOf(sysUser.getUserId()));
+// detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+// //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉
+// if (null != project.getProDefault()) {
+// detail.setProResult(project.getProDefault());
+// } else {
+// detail.setProResult(null);
+// }
+// detail.setIsSampling(String.valueOf(project.getIsSampling()));
+//
+// tjOrderDetailService.save(detail);
+// }
+// }
+// }
+
+ //娣诲姞remark琛ㄦ暟鎹�
+ remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+
+ //鍒ゆ柇鏄惁浜ら挶
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ }
+ }
+ if (tjFlowingWater.getPayStasus() == 1) {
+ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
+ sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+ }
+ if (tjFlowingWater.getDiscount() == null) {
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
+ } else {
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
+ }
+
+ tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
+// List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
+// if (list != null) {
+// for (TjOrderDetail tjOrderDetail : list) {
+// TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
+// if(tjProject==null){
+// continue;
+// }
+// tjOrderDetail.setProject(tjProject);
+// if (tjProject.getProParentId() == 0) {
+// TjOrderRemark tjOrderRemark = new TjOrderRemark();
+// tjOrderRemark.setProId(tjProject.getProId());
+// tjOrderRemark.setProName(tjProject.getProName());
+// tjOrderRemark.setDeptId(tjProject.getDeptId());
+// tjOrderRemark.setTjNumber(tjOrder.getTjNumber());
+// tjOrderRemark.setCreateBy(sysUser.getNickName());
+// tjOrderRemark.setCreateTime(new Date());
+// tjOrderRemark.setUpdateBy(sysUser.getNickName());
+// tjOrderRemark.setUpdateTime(new Date());
+// tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+// tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+// orderRemarkService.save(tjOrderRemark);
+// }
+// if ("1".equals(tjOrder.getTjType())) {
+// if (null != tjReservation && tjReservation.getPayType() == 1) {
+// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+// }
+// if(tjFlowingWater.getPayStasus()==1){
+// tjOrderDetail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+// }
+// tjOrderDetailService.updateById(tjOrderDetail);
+// }
+// }
+ }
+
+ @PostMapping("/heXiaoByIds")
@ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
@Transactional
- public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
- for (String orderId : orderIds) {
- final TjOrder byId = tjOrderService.getById(orderId);
- byId.setHeshouStatus(1);
- byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
- byId.setHeshouTime(new DateTime());
- final boolean b = tjOrderService.updateById(byId);
- if (!b) {
- return AjaxResult.error("鏍告敹澶辫触");
+ @RepeatSubmit
+ public AjaxResult heXiaoByIds(@RequestBody List<String> orderIds) {
+ if (null != orderIds && !orderIds.isEmpty()) {
+ Date date = new Date();
+ for (String orderId : orderIds) {
+ TjOrder byId = tjOrderService.getById(orderId);
+ if (null != byId) {
+
+ /*if (byId.getReportTime() == null) {
+ LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
+ tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
+ TjReportTemplate reportTemplate = reportTemplateService.getOne(tjReportTemplateLambdaQueryWrapper);
+ if ("鎶ヨ〃".equals(reportTemplate.getPrint())) {
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(byId.getTjNumber()));
+ tjReport.setPath(reportTemplate.getUrl() + "?tjNum=" + byId.getTjNumber());
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("鎶ヨ〃");
+ tjReportService.save(tjReport);
+ //淇敼order琛ㄤ腑鐨勬墦鍗版姤鍛婃椂闂翠负褰撳墠鏃堕棿
+ LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(TjOrder::getTjNumber, byId.getTjNumber());
+ updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+ tjOrderService.update(updateWrapper);
+ }
+
+ LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjCustomer::getCusId, byId.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjReportTemplate::getFlag, "4");
+ wrapper.eq(TjReportTemplate::getOpen, "1");
+ TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
+ try {
+ shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);
+ byId.setStatus(TjConstants.TJ_END);
+ } catch (Exception e) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ e.printStackTrace();
+ // 璋冪敤鎾ら攢
+ logger.error("鐢熸垚鎶ュ憡寮傚父");
+ return AjaxResult.error("鐢熸垚鎶ュ憡寮傚父,鏍告敹澶辫触");
+ }
+ }*/
+ byId.setHeshouStatus(1);
+ byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
+ byId.setHeshouTime(date);
+ final boolean b = tjOrderService.updateById(byId);
+ if (!b) {
+ return AjaxResult.error("鏍告敹澶辫触");
+ }
+ }
}
}
return AjaxResult.success("鏍告敹鎴愬姛");
+ }
+
+
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
+
+ AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate, zongJianYiShiQianMing);
+ if (!ajaxResult.get("code").toString().equals("200")) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ } else {
+ Long userId = tjCustomer.getCusId();
+ String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_鎶ュ憡.pdf";
+ TjReport tjReport = new TjReport();
+ tjReport.setTjNumber(String.valueOf(tjNumber));
+ tjReport.setPath(urlValue + outputFileName1);
+ String outputPath1 = value + File.separator;
+ String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+ tjReport.setReport(pdfBinary);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("pdf");
+ tjReportService.save(tjReport);
+ }
+ return ajaxResult;
}
@GetMapping("/getHistryTjOrderByCusIdCard")
@@ -2517,47 +3210,82 @@
// if (null != payByTjNum) {
// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
// }
- tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
- tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
- remarkService.deletedOrderRemarkByTjNum(tjNum);
- tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
- transitionService.deletedTbTransitionByTjNum(tjNum);
+ if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- if (null != customer) {
- customer.setCardId("0");
- tjCustomerService.updateById(customer);
- }
- String configByKey = configService.selectConfigByKey("sfkqdyhis");
- if (configByKey.equals("Y")) {
- HashMap<String, Object> map = new HashMap<>();
- map.put("cardtype", "4");
- map.put("input", order.getCardId());
- LocalDate currentDate = LocalDate.now();
- LocalDateTime startOfDay = currentDate.atStartOfDay();
- LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- String ksrq = startOfDay.format(formatter);
- String jsrq = nineteenOClock.format(formatter);
- map.put("ksrq", ksrq);
- map.put("jsrq", jsrq);
- AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
- if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
- } else {
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
- if (zfHisApiMethods) {
- return AjaxResult.success("鎾ら攢鎴愬姛", map);
+ Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+
+ String s = configService.selectConfigByKey("is_request_common_his_api");
+// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+ if (null != s && s.equals("Y") && !useLisAndPacsRegister) {
+ String apiUrl = configService.selectConfigByKey("common_api_url");
+ String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+
+ ArrayList<TjFlowingWater> weizhifu = new ArrayList<>();
+ ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
+ LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TjFlowingWater::getOrderId, order.getOrderId());
+ wrapper1.orderByDesc(TjFlowingWater::getJxbz);
+ List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
+ LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjCustomer::getCusId, order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
+
+ for (TjFlowingWater water : list) {
+ if (water.getPayStasus() == 0L) {
+ weizhifu.add(water);
} else {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ yizhifu.add(water);
}
}
+
+ AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, tjNum);
+ if (error != null && !error.get("code").toString().equals("200")) return error;
+
+ AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, tjNum);
+ if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+ } else {
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNum);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(tjNum);
+ ycxmService.delOrderYcXmJyByTjh(tjNum);
+
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+ xdPictureService.deleteTjXdPictureBytjNum(tjNum);
+ tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
}
-// transitionService.updateTbTransitionByTjNum(tjNum);
- return AjaxResult.success("鎾ら攢鎴愬姛!!!");
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (configByKey.equals("Y")) {
+
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ hisRequestParams.put("patientId", order.getCardId());
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+
+ BigDecimal cateFeeAll = BigDecimal.ZERO;
+ for (Map<String, String> datum : data) {
+ BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+ cateFeeAll = cateFeeAll.add(cateFee);
+ }
+ if (cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
+ }
+ }
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
+ if (zfHisApiMethods) {
+ return AjaxResult.success("鎾ら攢鎴愬姛");
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+
+ }
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
}
@@ -2579,11 +3307,11 @@
if (null != reservationTime)
wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime), DateUtil.endOfDay(reservationTime));
List<TjReservation> reservationList = tjReservationService.list(wq);
- if (null != reservationList && reservationList.size() > 0) {
+ if (null != reservationList && !reservationList.isEmpty()) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.in(TjOrder::getReservationId, reservationList.stream().map(TjReservation::getId).collect(Collectors.toList()));
List<TjOrder> orderList = tjOrderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
LambdaQueryWrapper<TjReservation> wq3 = new LambdaQueryWrapper<>();
wq3.in(TjReservation::getId, orderList.stream().map(TjOrder::getReservationId).collect(Collectors.toList()));
// wq3.eq(TjReservation::getTeamNo,reservationList.get(0).getTeamNo());
@@ -2600,11 +3328,11 @@
@ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
@Transactional
public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
- if (null != reservationIds && reservationIds.size() > 0) {
+ if (null != reservationIds && !reservationIds.isEmpty()) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.in(TjOrder::getReservationId, reservationIds);
List<TjOrder> orderList = tjOrderService.list(wq1);
- if (null != orderList && orderList.size() > 0) {
+ if (null != orderList && !orderList.isEmpty()) {
for (TjOrder order : orderList) {
// TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -2617,7 +3345,7 @@
remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
- transitionService.updateTbTransitionByTjNum(order.getTjNumber());
+// transitionService.updateTbTransitionByTjNum(order.getTjNumber());
}
}
for (String id : reservationIds) {
@@ -2646,7 +3374,7 @@
for (int i = 0; i < tjNumbers.size(); i++) {
String tjNumber = tjNumbers.get(i).getTjNumber();
try {
- List<Map<String, String>> djdInfos = tjOrderService.selectDjdInfo(tjNumber);
+ List<Map<String, Object>> djdInfos = tjOrderService.selectDjdInfo(tjNumber);
Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumber);
LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
@@ -2694,7 +3422,9 @@
@Transactional
public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
- TjOrder order = new TjOrder();
+ LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(TjOrder::getCardId, cardId);
+ TjOrder order = tjOrderService.getOne(queryWrapper);
order.setCardId(cardId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (configByKey.equals("Y")) {
@@ -2714,7 +3444,7 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
} else {
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛", map);
} else {
@@ -2728,7 +3458,7 @@
@GetMapping("/revokeTjOrderByTjh")
- @ApiOperation(value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
+ @ApiOperation(value = "寮哄埗鎾ら攢鎺ュ彛鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
@Transactional
public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
@@ -2738,11 +3468,633 @@
// if (null != payByTjNum) {
// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
// }
+ //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+ }
+ return AjaxResult.success();
+ }
+
+
+ @GetMapping("/getBlproByTjh")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栬ˉ褰曢」鐩褰�")
+ @Transactional
+ public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
+
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
+ if (null != order) {
+ LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjProBl::getTjh, tjNum);
+ List<TjProBl> blList = blService.list(wq);
+ if (null != blList && !blList.isEmpty()) {
+ for (TjProBl bl : blList) {
+ LambdaQueryWrapper<TjOrderRemark> wqr = new LambdaQueryWrapper<>();
+ wqr.eq(TjOrderRemark::getJxbz, bl.getBldh());
+ List<TjOrderRemark> remarkList = remarkService.list(wqr);
+ if (null != remarkList && !remarkList.isEmpty()) {
+ List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
+ LambdaQueryWrapper<TjProject> wqp = new LambdaQueryWrapper<>();
+ wqp.in(TjProject::getProId, collect);
+ List<TjProject> projectList = projectService.list(wqp);
+ for (TjProject project : projectList) {
+ project.setChildren(projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())));
+ }
+ bl.setProjectList(projectList);
+ }
+ }
+ return AjaxResult.success(blList);
+ }
+ return AjaxResult.success(null);
+ }
+ return AjaxResult.error("鏆傛棤浣撴璁板綍");
+ }
+
+
+ @PostMapping("/revokeBlProByBldhAndTjh")
+ @ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
+// @Transactional
+ public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
+
+ if (null == dto.getBldhs() || dto.getBldhs().isEmpty()) {
+ log.info("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
+ return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
+ }
+
+ TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
+ if (null != order) {
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (null != configByKey && configByKey.equals("Y")) {
+ log.info("dto鐨勬暟鎹槸" + JSONUtil.toJsonStr(dto));
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ hisRequestParams.put("patientId", order.getCardId());
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ log.info("queryPay ->{}", JSONUtil.toJsonStr(queryPay));
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+ log.info("data鐨勬暟鎹槸" + JSONUtil.toJsonStr(data));
+// BigDecimal cateFeeAll = BigDecimal.ZERO;
+// List<String> advIds = new ArrayList<>();
+ List<LtkjJianchajianyanTree> buLuXmXinXi = tjOrderService.getBuLuXmXinXi(dto.getBldhs(), order.getCardId());
+ log.info("buLuXmXinXi鐨勫�间负:==========" + buLuXmXinXi);
+ if (null != buLuXmXinXi && !buLuXmXinXi.isEmpty()) {
+ for (Map<String, String> datum : data) {
+ for (LtkjJianchajianyanTree tree : buLuXmXinXi) {
+ String advId = datum.get("Adv_Id").split("_")[1];
+ log.info("advid鐨勫�间负:==========" + advId);
+ log.info("tree鐨勫�间负:==========" + advId);
+ BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+ log.info("cateFee鐨勫�间负:==========" + cateFee);
+ log.info("tree.getFyhj()鐨勫�间负:==========" + tree.getFyhj());
+ if (tree.getSqdh().equals(advId) && cateFee.compareTo(new BigDecimal(tree.getFyhj())) == 0) {
+ log.info("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢");
+ return AjaxResult.error("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
+ }
+ }
+ }
+ }
+ }
+
+ boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
+ if (!b) {
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.info("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+ }
+ String s = configService.selectConfigByKey("is_request_common_his_api");
+ Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+// if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+ if (null != s && s.equals("Y") && !useLisAndPacsRegister) {
+ ArrayList<TjFlowingWater> weizhifu = new ArrayList<>();
+ ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
+ for (String bldh : dto.getBldhs()) {
+ LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjFlowingWater::getJxbz, bldh);
+ TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
+ if (water.getPayStasus() == 0L) {
+ weizhifu.add(water);
+ } else {
+ yizhifu.add(water);
+ }
+ }
+ String apiUrl = configService.selectConfigByKey("common_api_url");
+ String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+ LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjCustomer::getCusId, order.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
+ AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, dto.getTjh());
+ if (error != null && !error.get("code").toString().equals("200")) return error;
+
+ AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, dto.getTjh());
+ if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+ return AjaxResult.success();
+ } else {
+ try {
+ extracted(dto, order);
+ } catch (Exception e) {
+ log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
+ return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
+ }
+ return AjaxResult.success();
+ }
+ }
+ return AjaxResult.error();
+ }
+
+ private AjaxResult zuofeiYiZhifu(ArrayList<TjFlowingWater> yizhifu, TjCustomer tjCustomer, TjOrder order, String apiUrl, String hospbm, Boolean isDelete, String tjNum) {
+ if (!yizhifu.isEmpty()) {
+ for (TjFlowingWater water : yizhifu) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("pationId", tjCustomer.getPationId());
+ map.put("cardId", tjCustomer.getHisJzkh());
+ map.put("tjNum", water.getTjSerialNumber());
+ map.put("kaiDanKs", "7805");
+ // 鏀惰垂鏍囧織 1寰呮敹璐� 2寰呴��璐�
+ map.put("shouTuiStatus", "2");
+ JSONArray array = JSONUtil.createArray();
+ String bldh = water.getJxbz();
+ List<TbTransition> list;
+ if (bldh != null) {
+ LambdaQueryWrapper<TbTransition> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.eq(TbTransition::getJxbz, bldh);
+ wrapper1.gt(TbTransition::getOrdPrice, 0);
+ list = tbTransitionService.list(wrapper1);
+ } else {
+ LambdaQueryWrapper<TbTransition> wrapper1 = new LambdaQueryWrapper<>();
+ wrapper1.isNull(TbTransition::getJxbz);
+ wrapper1.eq(TbTransition::getTjNum, tjNum);
+ wrapper1.gt(TbTransition::getOrdPrice, 0);
+ list = tbTransitionService.list(wrapper1);
+ }
+ for (TbTransition transition : list) {
+ LambdaQueryWrapper<TjProject> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(TjProject::getProId, transition.getProId());
+ TjProject project = projectService.getOne(queryWrapper);
+ LambdaQueryWrapper<TjFlowingWaterHis> wrapper2 = new LambdaQueryWrapper<>();
+ wrapper2.eq(TjFlowingWaterHis::getParentId, water.getHisWaterId());
+ wrapper2.eq(TjFlowingWaterHis::getXmId, project.getHisXmbm());
+ List<TjFlowingWaterHis> list1 = tjFlowingWaterHisService.list(wrapper2);
+ for (TjFlowingWaterHis waterHis : list1) {
+ LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SysDept::getDeptId, project.getDeptId());
+ SysDept dept = sysDeptService.getOne(wrapper);
+ JSONObject obj = JSONUtil.createObj();
+ BigDecimal danjia = transition.getOrdPrice();
+ Integer sl = project.getSl();
+ BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
+ obj.putOpt("danJia", danjia);
+ obj.putOpt("jieSuanJe", allPrice.negate());
+ obj.putOpt("shuliang", Math.negateExact(sl));
+ obj.putOpt("feiYongMxId", waterHis.getCurrentId());
+ obj.putOpt("feiYongId", water.getHisWaterId());
+ obj.putOpt("zhiXingKs", dept.getDeptId());
+ obj.putOpt("zhiXingKsMc", dept.getDeptName());
+ obj.putOpt("shouFeiXmId", project.getHisXmbm());
+ obj.putOpt("shouFeiXmMc", project.getHisXmmc());
+
+// obj.putOpt("zhiXingKs","7805");
+// obj.putOpt("zhiXingKsMc","浣撴绉�");
+// obj.putOpt("shouFeiXmId","4735346");
+// obj.putOpt("shouFeiXmMc","浣撴璐�");
+ array.add(obj);
+ }
+
+ }
+ map.put("feiYongInfoList", array);
+ log.info("閫�璐圭敵璇� 鍏ュ弬 -> {}", JSONUtil.toJsonStr(map));
+ String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
+ log.info("閫�璐圭敵璇� 杩斿洖 -> {}", JSONUtil.toJsonStr(post));
+ if (null != post) {
+ JSONObject jsonObject = JSONUtil.parseObj(post);
+ if (jsonObject.getStr("code").equals("200")) {
+ // hisTfWaterId
+ String tfid = jsonObject.getJSONObject("data").getStr("feiYongId");
+ water.setHisTfWaterId(tfid);
+ tjFlowingWaterService.updateById(water);
+ if (isDelete) {
+ for (TjFlowingWater water1 : yizhifu) {
+ String bldh1 = water1.getJxbz();
+ remarkService.deleteTjOrderDetailByjxbz(bldh1);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh1);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh1);
+ transitionService.deleteTjOrderDetailByjxbz(bldh1);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh1));
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh1);
+ }
+ }
+ } else return AjaxResult.error();
+ }
+ }
+ }
+ return null;
+ }
+
+ private AjaxResult zuofeiWeiZhifu(ArrayList<TjFlowingWater> weizhifu, TjCustomer tjCustomer, String apiUrl, String hospbm, TjOrder order, Boolean isDelete, String tjNum) {
+ if (!weizhifu.isEmpty()) {
+ HashMap<String, Object> chexiaoMap = new HashMap<>();
+ chexiaoMap.put("pationId", tjCustomer.getPationId());
+ chexiaoMap.put("cardId", tjCustomer.getHisJzkh());
+ String feiyongList = weizhifu.stream().map(TjFlowingWater::getHisWaterId).collect(Collectors.joining(","));
+ chexiaoMap.put("feiYongIdList", feiyongList.trim().replaceAll(" ", ""));
+
+ String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/revokeCost", chexiaoMap);
+ if (JSONUtil.parseObj(post).getStr("code").equals("200")) {
+ if (isDelete) {
+ for (TjFlowingWater water : weizhifu) {
+ String bldh = water.getJxbz();
+ if (StrUtil.isNotBlank(bldh)) {
+ remarkService.deleteTjOrderDetailByjxbz(bldh);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
+ transitionService.deleteTjOrderDetailByjxbz(bldh);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh));
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh);
+ } else {
+ //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNum);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+ transitionService.deletedTbTransitionByTjNum(tjNum);
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+ }
+
+ }
+ }
+ } else return AjaxResult.error();
+ }
+ return null;
+ }
+
+ // @Transactional(propagation =Propagation.REQUIRES_NEW)
+ public void extracted(TjProBlDto dto, TjOrder order) {
+ for (String bldh : dto.getBldhs()) {
+ remarkService.deleteTjOrderDetailByjxbz(bldh);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
+ transitionService.deleteTjOrderDetailByjxbz(bldh);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
+ }
+ tjSamplingMapper.deleteByTjNumAndCusIdAndJxbz(dto.getTjh(), order.getUserId(), dto.getBldhs());
+ }
+
+
+ @PostMapping("/addYaoPinShenQing")
+ @ApiOperation(value = "鑽搧淇℃伅鐢宠")
+ @Transactional
+ public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto) {
+ AjaxResult result = controller.Outpinmedicapply(dto);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (null != code && code.equals("0")) {
+
+ }
+ return AjaxResult.success();
+ }
+
+
+ @GetMapping("/chushenyemianqijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(2);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
+ @GetMapping("/chushenyemianyijianjiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianyijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(1);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
+
+
+ @PostMapping("/zongjanyemianshjianzhou")
+ @ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
+ @Transactional
+ public AjaxResult zongjanyemianshjianzhou(@RequestBody List<String> tjNUms) {
+
+ if (null != tjNUms && !tjNUms.isEmpty()) {
+ List<Map<String, Object>> list = new ArrayList<>();
+ for (String tjNUm : tjNUms) {
+ Map<String, Object> map = new HashMap<>();
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if (null != order) {
+ int czwj = remarkService.panduaniscunzaiweijian(tjNUm);
+ int sfwc = remarkService.panduaniswancheng(tjNUm);
+ Date checkTime = order.getCheckTime();
+ Date reportTime = order.getReportTime();
+ Integer heshouStatus = order.getHeshouStatus();
+ Date lastTime = order.getPrintLastTime();
+ int a = 0;
+ if (czwj == 0) {
+ //鏈
+ a = 0;
+ }
+ if (czwj > 0) {
+ //鍦ㄦ
+ a = 1;
+ }
+ if (sfwc == 0) {
+ //宸插畬鎴�
+ a = 2;
+ }
+ if (null != checkTime) {
+ //宸插鏍�
+ a = 3;
+ }
+ if (null != reportTime) {
+ //鐢熸垚鎶ュ憡
+ a = 4;
+ }
+ if (heshouStatus == 1) {
+ //鎶ュ憡鏍告敹
+ a = 5;
+ }
+ if (null != lastTime) {
+ //宸叉墦鍗�
+ a = 6;
+ }
+ map.put("tjNUm", tjNUm);
+ map.put("sjz", a);
+ list.add(map);
+ }
+ }
+ return AjaxResult.success(list);
+ }
+ return AjaxResult.error();
+ }
+
+
+ @PostMapping("/heshouchexiao")
+ @ApiOperation(value = "鎾ら攢鎶ュ憡鎺ュ彛")
+ @Transactional
+ public AjaxResult heshouchexiao(@RequestBody List<String> tjNUms) {
+
+ if (null != tjNUms && !tjNUms.isEmpty()) {
+
+ // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
+ //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
+ LambdaQueryWrapper<TjReport> wq1 = new LambdaQueryWrapper<>();
+ wq1.select(TjReport::getReId);
+ wq1.in(TjReport::getTjNumber, tjNUms);
+ wq1.eq(TjReport::getPrint, "pdf");
+ List<Long> list = tjReportService.list(wq1).stream().map(TjReport::getReId).collect(Collectors.toList());
+ for (String tjNUm : tjNUms) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if (null != order) {
+ order.setHeshouStatus(0);
+ order.setHeshouTime(null);
+ order.setHeshouDoctor(null);
+ order.setPrintLastTime(null);
+ order.setReportTime(null);
+ order.setStatus(TjConstants.TJ_WAIT);
+ if (!tjOrderService.updateById(order)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触");
+ }
+ }
+ }
+ if (!list.isEmpty()) {
+ int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{}));
+ if (i == 0) {
+ return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+ }
+ }
+ return AjaxResult.success("鎿嶄綔鎴愬姛");
+ }
+ return AjaxResult.error();
+ }
+
+
+ @GetMapping("/qiandaodengjitianjiaxiangmubydanweifenzu")
+ @ApiOperation(value = "绛惧埌鐧昏鏍规嵁鍗曚綅鍒嗙粍鑾峰彇浣撴椤圭洰")
+ @Transactional
+ public AjaxResult qiandaodengjitianjiaxiangmubydanweifenzu(@RequestParam String cusIdcard, @RequestParam String groupingId) {
+ try {
+ transitionService.saveTemoTransitionByGroupingId(cusIdcard, groupingId);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return AjaxResult.error();
+ }
+ }
+
+ @PostMapping("/ttaddtTransition")
+ @ApiOperation(value = "鍥綋娣诲姞杩囨浮琛ㄦ暟鎹�")
+ @Transactional
+ public AjaxResult ttaddtTransition(@RequestBody Map<String, Object> map) {
+ Object packId = map.get("pacId");
+ if (null == map.get("cusId")) return AjaxResult.error("璇烽�夋嫨浣撴浜�");
+ String cusId = map.get("cusId").toString();
+ Object proIds1 = map.get("proIds");
+ List<Long> proIds = null;
+ if (null != proIds1 && !proIds1.equals("")) {
+ proIds = JSON.parseArray(proIds1.toString(), Long.class);
+ }
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+ String cardId = "0";
+ if (null != tjCustomer) {
+ cardId = tjCustomer.getCardId();
+ }
+ if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
+ transitionService.deletedTbTransitionByCusId(cusId);
+ }
+ /*濂楅*/
+ if (null != packId && !packId.equals("")) {
+ Long pacId = Long.valueOf(packId.toString());
+ List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
+ if (null == list || list.isEmpty()) {
+ transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
+ String string = transitionService.ttpanduantaocanshifouchongfu(cusId, pacId);
+ if (!StringUtils.isBlank(string)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
+ }
+ transitionService.ttsaveTemoTransitionByGroupingId(cusId, cardId, pacId.toString());
+ //琛ュ樊浠�
+ List<Map<String, Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
+ if (null != cjMaps && !cjMaps.isEmpty()) {
+ for (Map<String, Object> cjMap : cjMaps) {
+ transitionService.buxiangmuchajia(cusId, pacId.toString(), cjMap.get("xmid").toString(), new BigDecimal(cjMap.get("cj").toString()));
+ }
+ }
+
+ }
+ }
+
+ //鍗曢」
+ if (null != proIds && !proIds.isEmpty()) {
+ //寮傛淇濆瓨鏁版嵁搴撹〃
+ for (Long proId : proIds) {
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ if (null != project) {
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.isEmpty()) {
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
+ }
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
+
+
+ @GetMapping(value = "newgetTransitionList")
+ @ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
+ public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+// String pacId = transitionService.getTbTransitionPacId(cusId);
+// if(StringUtil.isNotBlank(pacId)){
+// //琛ュ樊浠�
+// List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId, cusId);
+// if(null !=cjMaps && !cjMaps.isEmpty()){
+// for (Map<String, Object> cjMap : cjMaps) {
+// transitionService.buxiangmuchajia(cusId,pacId,cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
+// }
+// }
+// }
+ List<TbTransition> list = transitionService.newgetTransitionList(cusId);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping(value = "updateTransitionnewPrice")
+ @ApiOperation(value = "绛惧埌鐧昏椤甸潰鏍规嵁鎶樻墸淇敼椤圭洰鐜颁环")
+ @Transactional
+ public AjaxResult updateTransitionnewPrice(@RequestBody List<UpdateTransitionnewPriceDto> dtos) {
+
+ if (null != dtos && !dtos.isEmpty()) {
+ int index = 0;
+ boolean flag = false;
+ for (UpdateTransitionnewPriceDto dto : dtos) {
+ index++;
+ LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
+ wq.eq(TbTransition::getCusId, dto.getCusIdCard());
+ wq.eq(TbTransition::getParentProId, dto.getParentProId());
+ wq.isNull(TbTransition::getTjNum);
+ List<TbTransition> list = transitionService.list(wq);
+ log.info("淇敼鐨勫鎴疯韩浠借瘉鍙蜂负: " + dto.getCusIdCard());
+ log.info("鐖堕」鐩甶d涓�: " + dto.getParentProId());
+ log.info("鎶樻墸涓�: " + new BigDecimal(dto.getDiscount()));
+ if (null != list && !list.isEmpty()) {
+
+ for (TbTransition transition : list) {
+ BigDecimal ordPrice = transition.getOrdPrice();
+ BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+ log.info("鍚庣璁＄畻鐨勯噾棰�: " + multiply.toString());
+ transition.setNowPrice(multiply);
+ transition.setDiscount(new BigDecimal(dto.getDiscount()));
+ transitionService.updateById(transition);
+ }
+
+ BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(), dto.getParentProId());
+
+ BigDecimal yhj = dto.getYhj();
+ log.info("鍓嶇浼犻�掔殑浠锋牸锛歿}",yhj.toString());
+ BigDecimal cj = yhj.subtract(dxzj);
+ log.info("璁＄畻鐨勫樊浠凤細{}",cj.toString());
+ for (TbTransition transition : list) {
+ BigDecimal result = transition.getNowPrice().add(cj);
+ log.info("琛ヤ笂宸环鍓嶇殑浠锋牸涓猴細{}",transition.getNowPrice().toString());
+ if (result.compareTo(BigDecimal.ZERO)>0 && !flag && cj.compareTo(BigDecimal.ZERO) != 0){
+ transition.setNowPrice(result);
+ transitionService.updateById(transition);
+ log.info("淇敼 琛ヤ笂宸环鍚庣殑浠锋牸涓猴細{}",result.toString());
+ flag = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ return AjaxResult.success();
+ }
+
+
+
+ @PostMapping("/huifuyuyuejilu")
+ @ApiOperation(value = "浣撴璁板綍椤甸潰鎭㈠棰勭害璁板綍鎺ュ彛")
+ @Transactional
+ public AjaxResult huifuyuyuejilu(@RequestBody List<String> tjNUms) {
+
+ if (null != tjNUms && !tjNUms.isEmpty()) {
+ for (String tjNUm : tjNUms) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if(null !=order && StringUtil.isNotBlank(order.getReservationId())){
+ //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
+ tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+ tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+ remarkService.deletedOrderRemarkByTjNum(tjNUm);
+ tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+// transitionService.deletedTbTransitionByTjNum(tjNum);
+ tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+
+ TjReservation reservation = tjReservationService.getById(order.getReservationId());
+ if(null !=reservation){
+ reservation.setIsExpire(2);
+ tjReservationService.updateById(reservation);
+ transitionService.updateTbTransitionByTjNum(tjNUm);
+ }
+
+ }
+ }
+
+ return AjaxResult.success();
+ }
+ return AjaxResult.error();
+ }
+
+
+
+ @PostMapping("/addBlTransition")
+ @ApiOperation(value = "琛ュ綍娣诲姞杩囨浮琛ㄦ暟鎹�")
+ @Transactional
+ public AjaxResult addBlTransition(@RequestBody Map<String, Object> map) {
+ Object packId = map.get("pacId");
+ if (null == map.get("cusId")) return AjaxResult.error("璇烽�夋嫨浣撴浜�");
+ String cusId = map.get("cusId").toString();
+ Object proIds1 = map.get("proIds");
+ List<Long> proIds = null;
+ if (null != proIds1 && !proIds1.equals("")) {
+ proIds = JSON.parseArray(proIds1.toString(), Long.class);
+ }
+ TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+ String cardId = "0";
+ if (null != tjCustomer) {
+ cardId = tjCustomer.getCardId();
+ }
+ if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
+ transitionService.deletedTbTransitionByCusId(cusId);
+ }
+
+ //鍗曢」
+ if (null != proIds && !proIds.isEmpty()) {
+ //寮傛淇濆瓨鏁版嵁搴撹〃
+ for (Long proId : proIds) {
+ TjProject project = projectService.selectTjProjectByProId(proId);
+ if (null != project) {
+ List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+ if (null == transitionList || transitionList.isEmpty()) {
+ transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
+ }
+ }
+ }
}
return AjaxResult.success();
}
--
Gitblit v1.8.0