From f0cca3a055f5fc8dd62a96f599ab2cf9cc0a9cf7 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期六, 12 十月 2024 15:19:44 +0800
Subject: [PATCH] 修改lis检验申请单逻辑
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 952 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 484 insertions(+), 468 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 b4a37a5..18708b7 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,9 @@
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.RandomUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
@@ -29,15 +32,19 @@
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.AgeResult;
+import com.ltkj.common.utils.DateUtils;
import com.ltkj.common.utils.PDFDocumentUtil;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
@@ -50,6 +57,7 @@
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
+import com.ltkj.hosp.pacsDto.SavePacsApply;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
@@ -67,20 +75,22 @@
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.web.controller.his.*;
+import com.ltkj.web.controller.lis.LisApiMethod;
+import com.ltkj.web.controller.pacs.PacsApiMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
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.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;
@@ -92,6 +102,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
*
@@ -99,8 +111,8 @@
* @date 2022-11-21
*/
@RestController
-@RequestMapping ("/hosp/order")
-@Api (tags = "PC绔� ----浣撴璁板綍鎺ュ彛")
+@RequestMapping("/hosp/order")
+@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛")
@Slf4j
public class TjOrderController extends BaseController {
@Resource
@@ -125,7 +137,7 @@
private ITbTransitionService transitionService;
@Resource
private ISysConfigService configService;
- @Value ("${path.filePath}")
+ @Value("${path.filePath}")
private String value;
@Resource
private ITjOrderRemarkService remarkService;
@@ -133,61 +145,44 @@
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
@@ -196,11 +191,26 @@
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;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -217,8 +227,8 @@
* 鏌ヨ浣撴璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:list')")
- @GetMapping ("/list")
- @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃(榛樿)")
+ @GetMapping("/list")
+ @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃(榛樿)")
public TableDataInfo list(TjOrder tjOrder) {
startPage();
startOrderBy();
@@ -251,16 +261,16 @@
}
- @GetMapping ("/getWenJuanList")
- @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃")
- public AjaxResult getWenJuanList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍙�") @RequestParam (required = false) String tjNum,
- @ApiParam (value = "濮撳悕") @RequestParam (required = false) String name,
- @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) {
+ @GetMapping("/getWenJuanList")
+ @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
+ public AjaxResult getWenJuanList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍙�") @RequestParam(required = false) String tjNum,
+ @ApiParam(value = "濮撳悕") @RequestParam(required = false) String name,
+ @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) {
Map<String, Object> map = new HashMap<>();
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -380,16 +390,17 @@
}
- @GetMapping ("/getOrderList")
- @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) String tjNum,
- @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
- @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) {
+ @GetMapping("/getOrderList")
+ @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) 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) {
Map<String, Object> map = new HashMap<>();
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -459,6 +470,12 @@
if (null != tjNum) {
wq.eq(TjOrder::getTjNumber, tjNum);
}
+
+
+ if (null != xmmc) {
+ wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc));
+ }
+
wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
List<TjOrder> list = page2.getRecords();
@@ -470,7 +487,6 @@
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());
@@ -484,8 +500,7 @@
if (null != order.getPacId()) {
if (null != tjPackageService.getById(order.getPacId())) {
order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
- }
- if (null != dwDeptService.getById(order.getPacId())) {
+ } else if (null != dwDeptService.getById(order.getPacId())) {
order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
}
}
@@ -497,20 +512,20 @@
}
- @GetMapping ("/getOrderListOO")
- @ApiOperation (value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
- public AjaxResult getOrderListOO(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @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) {
+ @GetMapping("/getOrderListOO")
+ @ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
+ public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
+ @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+ @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
+ @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
Map<String, Object> map = new HashMap<>();
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) {
+ if (null != customerList && !customerList.isEmpty()) {
List<TjOrder> list = new ArrayList<>();
for (TjCustomer customer : customerList) {
LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
@@ -520,7 +535,7 @@
list.addAll(tjOrderService.list(wq));
}
List<TjOrder> collect = null;
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
for (int i = 0; i < list.size(); i++) {
TjCustomer tjCustomer = tjCustomerService.getById(list.get(i).getUserId());
@@ -530,7 +545,7 @@
}
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).setTjCustomerName(tjCustomer.getCusName());
list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
@@ -573,13 +588,13 @@
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 (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.orderByDesc(TjOrder::getReportTime);
+ wq.orderByDesc(TjOrder::getCreateTime);
Page<TjOrder> page2 = tjOrderService.page(page1, wq);
List<TjOrder> list = page2.getRecords();
if (list != null) {
@@ -591,7 +606,7 @@
}
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).setTjCustomerName(tjCustomer.getCusName());
list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
if (tjCustomer.getCusIdcard() != null) {
list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
@@ -626,15 +641,15 @@
}
- @GetMapping ("/getPrintOrderList")
- @ApiOperation (value = "浣撴鍙戠エ鎵撳嵃鎺ュ彛")
- public AjaxResult getPrintOrderList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍙�)") @RequestParam (required = false) String tjNum,
- @ApiParam (value = "宸叉墦鍗版湭鎵撳嵃0鏈墦鍗�1宸叉墦鍗�)") @RequestParam (required = false) Integer type,
- @ApiParam (value = "濮撳悕") @RequestParam (required = false) String name,
- @ApiParam (value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam (required = false) Date bgbeginTime,
- @ApiParam (value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam (required = false) Date bgendTime) {
+ @GetMapping("/getPrintOrderList")
+ @ApiOperation(value = "浣撴鍙戠エ鎵撳嵃鎺ュ彛")
+ public AjaxResult getPrintOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
+ @ApiParam(value = "宸叉墦鍗版湭鎵撳嵃0鏈墦鍗�1宸叉墦鍗�)") @RequestParam(required = false) Integer type,
+ @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<>();
List<TjOrder> collect = null;
if (null != name) {
@@ -825,9 +840,9 @@
* 瀵煎嚭浣撴璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:export')")
- @Log (title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping ("/export")
- @ApiOperation (value = "瀵煎嚭浣撴璁板綍鍒楄〃")
+ @Log(title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ @ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
public void export(HttpServletResponse response, TjOrder tjOrder) {
//List<TjOrder> list = tjOrderService.selectTjOrderList(tjOrder);
List<TjOrder> list = tjOrderService.selectExportOrderList(tjOrder);
@@ -839,15 +854,15 @@
* 鑾峰彇浣撴璁板綍璇︾粏淇℃伅
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:query')")
- @GetMapping (value = "/{orderId}")
- @ApiOperation (value = "鑾峰彇浣撴璁板綍璇︾粏淇℃伅")
- public AjaxResult getInfo(@PathVariable ("orderId") Long orderId) {
+ @GetMapping(value = "/{orderId}")
+ @ApiOperation(value = "鑾峰彇浣撴璁板綍璇︾粏淇℃伅")
+ public AjaxResult getInfo(@PathVariable("orderId") Long orderId) {
return success(tjOrderService.selectTjOrderByOrderId(orderId));
}
- @GetMapping ("/getIsRequired")
- @ApiOperation (value = "鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏄惁蹇呭～椤癸紙韬唤璇併�佹�у埆銆佺數璇濄�佺収鐗囥�佹槸鍚︾洿鎺ヤ笅鍗曪級")
+ @GetMapping("/getIsRequired")
+ @ApiOperation(value = "鏍规嵁鍙傛暟閰嶇疆鑾峰彇鏄惁蹇呭～椤癸紙韬唤璇併�佹�у埆銆佺數璇濄�佺収鐗囥�佹槸鍚︾洿鎺ヤ笅鍗曪級")
public AjaxResult getIsRequired() {
Map<String, String> res = new HashMap<>();
res.put("has_idcard", configService.selectConfigByKey("has_idcard"));
@@ -859,12 +874,18 @@
}
+
/**
* 浣撴绛惧埌鐧昏鎺ュ彛
*/
+
+
+ ReentrantLock lock=new ReentrantLock();
+
@PostMapping
- @ApiOperation (value = "浣撴绛惧埌鐧昏鎺ュ彛")
- @Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
+ @ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
+// @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);
@@ -886,8 +907,7 @@
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);
@@ -896,10 +916,10 @@
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("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
@@ -914,7 +934,7 @@
tjOrder.setGroupId(tjReservation.getGroupingId());
tjOrder.setFirmDeptId(tjReservation.getPacId());
}
-// if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
+ // if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
if (null != tjReservation.getTeamNo()) {
@@ -923,9 +943,7 @@
tjOrder.setTjType("2");
}
}
- //鐢熸垚浣撴鍙�
- String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
- tjOrder.setTjNumber(tjNumber);
+
if (null != tjOrder.getPhoto()) {
File file = new File(tjOrder.getPhoto());
if (file.isFile()) {
@@ -952,147 +970,169 @@
tjOrder.setFinishTime(new Date());
tjOrder.setCheckStatus(1);
tjOrder.setStatus(TjConstants.TJ_WAIT);
+ // tjFlowingWater.setPayStasus(1L);
}
- if (tjOrderService.save(tjOrder)) {
+ tjFlowingWater.setPayStasus(0L);
- //淇濆瓨鏀惰揣鍦板潃
- if ("2".equals(tjOrder.getGetType())) {
- final TjReportGetAddress address = tjOrder.getAddAddress();
- if (address != null) {
- address.setTjNumber(tjNumber);
- tjReportGetAddressService.save(address);
- }
- }
- 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);
- }
- }
+ try {
+ boolean b = lock.tryLock(3, TimeUnit.MINUTES);
+ if(b){
+ //鐢熸垚浣撴鍙�
+ String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+ tjOrder.setTjNumber(tjNumber);
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
- final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
- final String isPay = configService.selectConfigByKey("isPay");
- if ("Y".equals(getInfoFromSqlData)) {
- LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
- if (null != middleHead) {
- tjFlowingWater.setPayStasus(1L);
- }
- }
- tjFlowingWater.setOrderId(tjOrder.getOrderId());
- Date date1 = new Date(System.currentTimeMillis());
- String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
- tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
-
-
- tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
- tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
- tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-
- if (isPay.equals("true")) {
- if (null != mallOrder) {
- if (mallOrder.getOrderStatus().equals(201L)) {
- tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
- tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
- tjFlowingWater.setDiscount(String.valueOf(1));
- tjFlowingWater.setPayStasus(1L);
- tjFlowingWater.setPayType(3L);
- MallCheckLog checkLog = new MallCheckLog();
- checkLog.setCheckBy(sysUser.getNickName());
- checkLog.setUserId(mallOrder.getUserId());
- checkLog.setConsignee(mallOrder.getConsignee());
- checkLog.setIdCard(mallOrder.getIdCard());
- checkLog.setOrderId(String.valueOf(mallOrder.getId()));
- checkLog.setOrderSn(mallOrder.getOrderSn());
- checkLog.setCheckTime(new Date());
- checkLog.setShipSn("HX" + s1);
- mallCheckLogService.save(checkLog);
- mallOrder.setOrderStatus(301L);
- mallOrderService.updateById(mallOrder);
+ if (tjOrderService.save(tjOrder)) {
+ //淇濆瓨鏀惰揣鍦板潃
+ if ("2".equals(tjOrder.getGetType())) {
+ final TjReportGetAddress address = tjOrder.getAddAddress();
+ if (address != null) {
+ address.setTjNumber(tjNumber);
+ tjReportGetAddressService.save(address);
+ }
}
- } else {
+ Long cusNumber = tjCustomer.getCusNumber();
+ cusNumber += 1;
+ tjCustomer.setCusNumber(cusNumber);
+ BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
+
+ if ("1".equals(tjOrder.getTjType())) {
+ if (null != tjReservation && tjReservation.getPayType() == 1) {
+ tjFlowingWater.setPayStasus(3L);
+ }
+ }
+
+ //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ final String isPay = configService.selectConfigByKey("isPay");
+ if ("Y".equals(getInfoFromSqlData)) {
+ LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
+ if (null != middleHead) {
+ tjFlowingWater.setPayStasus(1L);
+ }
+ }
+ tjFlowingWater.setOrderId(tjOrder.getOrderId());
+ Date date1 = new Date(System.currentTimeMillis());
+ String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+
+
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-// tjFlowingWater.setPayStasus(0L);
+
+ if (isPay.equals("true")) {
+ if (null != mallOrder) {
+ if (mallOrder.getOrderStatus().equals(201L)) {
+ tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
+ tjFlowingWater.setPaidIn(mallOrder.getActualPrice());
+ tjFlowingWater.setDiscount(String.valueOf(1));
+ tjFlowingWater.setPayStasus(1L);
+ tjFlowingWater.setPayType(3L);
+ MallCheckLog checkLog = new MallCheckLog();
+ checkLog.setCheckBy(sysUser.getNickName());
+ checkLog.setUserId(mallOrder.getUserId());
+ checkLog.setConsignee(mallOrder.getConsignee());
+ checkLog.setIdCard(mallOrder.getIdCard());
+ checkLog.setOrderId(String.valueOf(mallOrder.getId()));
+ checkLog.setOrderSn(mallOrder.getOrderSn());
+ checkLog.setCheckTime(new Date());
+ checkLog.setShipSn("HX" + s1);
+ mallCheckLogService.save(checkLog);
+ mallOrder.setOrderStatus(301L);
+ mallOrderService.updateById(mallOrder);
+ }
+ } else {
+ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
+ tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
+ tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
+ // tjFlowingWater.setPayStasus(0L);
+ }
+ }
+ if (tjFlowingWaterService.save(tjFlowingWater)) {
+ tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjOrderService.updateById(tjOrder);
+ }
+
+ //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+
+ /*璋冪敤his鎺ュ彛*/
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if (null != config && config.equals("Y")) {
+ 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);
+ }
+ //涓汉
+ if ("2".equals(tjOrder.getTjType())) {
+ //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ }
+ // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+ // String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
+ // String[] split = useLisAndPacsRegisterDictTeam.split(",");
+ // List<String> list = Arrays.asList(split);
+ // if (list.contains(tjOrder.getTjType())) {
+ // List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
+ // pacsApiMethodService.save(tjOrder,tjCustomer,detailList);
+ // lisApiMethod.save(tjOrder,tjCustomer,detailList);
+ // }else {
+ // hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+ // }
+
+ hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
+
+ return AjaxResult.success(tjNumber);
+ } else {
+ tjCustomer.setCardId(tjOrder.getTjNumber());
+ tjCustomerService.updateById(tjCustomer);
+ transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
+ tjOrder.setCardId(tjOrder.getTjNumber());
+ 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);
+ }
+ return AjaxResult.success(tjNumber);
}
+
+ return AjaxResult.error();
}
- 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());
- if (!result.get("code").toString().equals("200")) {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
- }
- } else {
- tjCustomer.setCardId(tjOrder.getTjNumber());
- tjCustomerService.updateById(tjCustomer);
- transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
- tjOrder.setCardId(tjOrder.getTjNumber());
- tjOrderService.updateById(tjOrder);
- }
- return AjaxResult.success(tjNumber);
+ } finally {
+ lock.unlock();
}
return AjaxResult.error();
}
- @PostMapping ("/addPlOrderAndDetail")
- @ApiOperation (value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
+ @PostMapping("/addPlOrderAndDetail")
+ @ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
@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) {
+ if (null != cusIds && !cusIds.isEmpty()) {
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
threadPools.execute(new Runnable() {
@@ -1105,7 +1145,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) {
@@ -1484,9 +1524,9 @@
* 淇敼浣撴璁板綍
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
- @Log (title = "浣撴璁板綍", businessType = BusinessType.UPDATE)
+ @Log(title = "浣撴璁板綍", businessType = BusinessType.UPDATE)
@PutMapping
- @ApiOperation (value = "淇敼浣撴璁板綍")
+ @ApiOperation(value = "淇敼浣撴璁板綍")
public AjaxResult edit(@RequestBody TjOrder tjOrder) {
return toAjax(tjOrderService.updateTjOrder(tjOrder));
}
@@ -1495,16 +1535,16 @@
* 鍒犻櫎浣撴璁板綍
*/
// @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
- @Log (title = "浣撴璁板綍", businessType = BusinessType.DELETE)
- @DeleteMapping ("/{orderIds}")
- @ApiOperation (value = "鍒犻櫎浣撴璁板綍")
+ @Log(title = "浣撴璁板綍", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{orderIds}")
+ @ApiOperation(value = "鍒犻櫎浣撴璁板綍")
public AjaxResult remove(@PathVariable Long[] orderIds) {
return toAjax(tjOrderService.deleteTjOrderByOrderIds(orderIds));
}
- @GetMapping ("/getOrderDetailByTjNumber")
- @ApiOperation (value = "鏍规嵁浣撴鍙疯幏鍙栦綋妫�璇︽儏")
- public AjaxResult getOrderDetailByTjNumber(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNumber) {
+ @GetMapping("/getOrderDetailByTjNumber")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栦綋妫�璇︽儏")
+ public AjaxResult getOrderDetailByTjNumber(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq0);
@@ -1524,8 +1564,8 @@
return AjaxResult.success("鏆傛棤鏁版嵁");
}
- @PostMapping ("/addtTransition")
- @ApiOperation (value = "娣诲姞杩囨浮琛ㄦ暟鎹�")
+ @PostMapping("/addtTransition")
+ @ApiOperation(value = "娣诲姞杩囨浮琛ㄦ暟鎹�")
@Transactional
public AjaxResult addtTransition(@RequestBody Map<String, Object> map) {
Object packId = map.get("pacId");
@@ -1550,150 +1590,39 @@
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) {
+ if (null != ppList && !ppList.isEmpty()) {
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 != 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) {
+ 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();
}
- @GetMapping ("/getTransitionList")
- @ApiOperation (value = "鏌ヨ杩囨浮琛ㄦ暟鎹�")
- public AjaxResult getTransitionList(@RequestParam @ApiParam (value = "瀹㈡埛id") String cusId) {
+ @GetMapping("/getTransitionList")
+ @ApiOperation(value = "鏌ヨ杩囨浮琛ㄦ暟鎹�")
+ public AjaxResult getTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
if (redisCache.hasKey(cusId + "cusId")) {
List<Map<String, Object>> list = redisCache.getCacheMapValue(cusId + "cusId", cusId);
return AjaxResult.success(list);
@@ -1708,16 +1637,16 @@
}
- @GetMapping ("/getQianLiList")
- @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃")
- public AjaxResult getQianLiList(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "浣撴鍙�") @RequestParam (required = false) String tjNum,
- @ApiParam (value = "濮撳悕") @RequestParam (required = false) String name,
- @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) {
+ @GetMapping("/getQianLiList")
+ @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
+ public AjaxResult getQianLiList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "浣撴鍙�") @RequestParam(required = false) String tjNum,
+ @ApiParam(value = "濮撳悕") @RequestParam(required = false) String name,
+ @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) {
Map<String, Object> map = new HashMap<>();
if (null != name) {
LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -1826,9 +1755,9 @@
/**
* 绛剧寮冩纭杩斿洖鏁版嵁
*/
- @GetMapping ("/abandon")
- @ApiOperation (value = "绛剧寮冩纭杩斿洖鏁版嵁")
- public AjaxResult abandon(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNumber) {
+ @GetMapping("/abandon")
+ @ApiOperation(value = "绛剧寮冩纭杩斿洖鏁版嵁")
+ public AjaxResult abandon(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderRemark::getTjNumber, tjNumber);
List<TjOrderRemark> remarkList = remarkService.list(wq);
@@ -1853,8 +1782,8 @@
*
* @ApiParam(value = "浣撴鍙�") String tjNumber
*/
- @PostMapping ("/tjGoOut")
- @ApiOperation (value = "浣撴绛剧")
+ @PostMapping("/tjGoOut")
+ @ApiOperation(value = "浣撴绛剧")
@Transactional
public AjaxResult tjGoOut(@RequestBody Map<String, Object> map) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
@@ -1919,7 +1848,6 @@
dto.setJzqk(9);
controller.Outpinimpapply(dto);
}*/
-
return AjaxResult.success("绛剧鎴愬姛锛�");
} else {
return getAjaxResult(tjNumber);
@@ -1930,10 +1858,10 @@
/**
* 绛剧
*/
- @GetMapping ("/goOut")
- @ApiOperation (value = "绛剧")
+ @GetMapping("/goOut")
+ @ApiOperation(value = "绛剧")
@Transactional
- public AjaxResult goOut(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNumber) {
+ public AjaxResult goOut(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
return getAjaxResult(tjNumber);
}
@@ -1941,9 +1869,9 @@
/**
* 鏍搁攢璁㈠崟鎺ュ彛
*/
- @GetMapping ("/orderShip")
- @ApiOperation (value = "PC绔墜鍔ㄦ牳閿�璁㈠崟鎺ュ彛")
- public AjaxResult orderShip(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
+ @GetMapping("/orderShip")
+ @ApiOperation(value = "PC绔墜鍔ㄦ牳閿�璁㈠崟鎺ュ彛")
+ public AjaxResult orderShip(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
if (tjNum == null) {
return AjaxResult.error();
}
@@ -2110,15 +2038,15 @@
}
- @GetMapping ("/tuanTiListById")
- @ApiOperation (value = "鏌ヨ鍥綋浣撴鐘舵��")
- public AjaxResult tuanTiListById(@ApiParam (value = "椤电爜鏁�(榛樿1)") @RequestParam (defaultValue = "1") Integer pageNum,
- @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
- @ApiParam (value = "鍗曚綅") @RequestParam String firmId,
- @ApiParam (value = "閮ㄩ棬") @RequestParam (required = false) String dwDeptId,
- @ApiParam (value = "鍒嗙粍") @RequestParam (required = false) String groupId,
- @ApiParam (value = "鐧昏寮�濮嬫椂闂�") @RequestParam Date beginTime,
- @ApiParam (value = "鐧昏缁撴潫鏃堕棿") @RequestParam Date endTime) {
+ @GetMapping("/tuanTiListById")
+ @ApiOperation(value = "鏌ヨ鍥綋浣撴鐘舵��")
+ public AjaxResult tuanTiListById(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "鍗曚綅") @RequestParam String firmId,
+ @ApiParam(value = "閮ㄩ棬") @RequestParam(required = false) String dwDeptId,
+ @ApiParam(value = "鍒嗙粍") @RequestParam(required = false) String groupId,
+ @ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam Date beginTime,
+ @ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam Date endTime) {
Map<String, Object> map = new HashMap<>();
int a = 0;
int b = 0;
@@ -2183,11 +2111,11 @@
}
- @GetMapping ("/tuanTiBingById")
- @ApiOperation (value = "鏌ヨ鍥綋浣撴鐥呯璇︾粏淇℃伅")
- public AjaxResult tuanTiBingById(@ApiParam (value = "鍗曚綅") @RequestParam String firmId,
- @ApiParam (value = "閮ㄩ棬") @RequestParam String firmDeptId,
- @ApiParam (value = "鐥呯") @RequestParam (required = false) String bingZhong) {
+ @GetMapping("/tuanTiBingById")
+ @ApiOperation(value = "鏌ヨ鍥綋浣撴鐥呯璇︾粏淇℃伅")
+ public AjaxResult tuanTiBingById(@ApiParam(value = "鍗曚綅") @RequestParam String firmId,
+ @ApiParam(value = "閮ㄩ棬") @RequestParam String firmDeptId,
+ @ApiParam(value = "鐥呯") @RequestParam(required = false) String bingZhong) {
List<TjOrderDetailRules> res1 = new ArrayList<>();
List<BingZhongVO> res = new ArrayList<>();
@@ -2246,8 +2174,8 @@
}
- @PostMapping ("/tuanTiBingChart")
- @ApiOperation (value = "鏌ヨ鍥綋浣撴鐥呯缁熻鍥�")
+ @PostMapping("/tuanTiBingChart")
+ @ApiOperation(value = "鏌ヨ鍥綋浣撴鐥呯缁熻鍥�")
public AjaxResult tuanTiBingChart(@RequestBody BingZhongVO bingZhongVO) {
List<TjOrderDetailRules> res1 = new ArrayList<>();
@@ -2286,18 +2214,18 @@
}
- @PostMapping ("/deletedTbTransitionByCusId")
- @ApiOperation (value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
- public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam (value = "韬唤璇佸彿") String cusId) {
+ @PostMapping("/deletedTbTransitionByCusId")
+ @ApiOperation(value = "鏍规嵁韬唤璇佸彿鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusId) {
LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
wq.between(TbTransition::getCreateTime, transitionService.getTbTransitionCreateTimeByCusId(cusId), new Date());
wq.eq(TbTransition::getCusId, cusId);
return AjaxResult.success(transitionService.remove(wq));
}
- @GetMapping ("/getTransitionInfo")
- @ApiOperation (value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
- public AjaxResult getTransitionInfo(@RequestParam ("tjNumber") String tjNumber) {
+ @GetMapping("/getTransitionInfo")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栨眹鎬诲拰鏄庣粏鐨勬暟鎹�")
+ 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)
@@ -2357,14 +2285,14 @@
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()));
+ 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()));
+ 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")) {
remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
@@ -2387,31 +2315,113 @@
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPayType(4L);
tjFlowingWaterService.updateById(tjFlowingWater);
- asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
+// asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
}
-// System.out.println("杩欐浠ｇ爜鏃堕棿" + (System.currentTimeMillis() - l));
}
- @PostMapping ("/heXiaoByIds/{orderIds}")
- @ApiOperation (value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
+ @PostMapping("/heXiaoByIds/{orderIds}")
+ @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
@Transactional
+ @RepeatSubmit
public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
+ Date date = new Date();
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("鏍告敹澶辫触");
+ 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::getReportTime, new Date());
+ updateWrapper.set(TjOrder::getPrintLastTime, new Date());
+ updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
+ updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
+ tjOrderService.update(updateWrapper);
+ }
+ String hisRegistrationId = byId.getCardId();
+ Date createTime = byId.getCreateTime();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String ksrq = dateFormat.format(createTime);
+ String jsrq = dateFormat.format(date);
+ HashMap<String, Object> params = new HashMap<>();
+ params.put("his_registration_id", hisRegistrationId);
+ params.put("ksbm", "");
+ params.put("pationid", "");
+ params.put("ksrq", ksrq);
+ params.put("jsrq", jsrq);
+ params.put("pagecount", 100);
+ params.put("page", 1);
+ LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
+ wq1.eq(TjCustomer::getCusId, byId.getUserId());
+ TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
+ try {
+ shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate);
+ byId.setStatus(TjConstants.TJ_END);
+ byId.setReportTime(date);
+ byId.setPrintLastTime(date);
+ byId.setDownloadLastTime(date);
+ } 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("鏍告敹鎴愬姛");
}
- @GetMapping ("/getHistryTjOrderByCusIdCard")
- @ApiOperation (value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴璁板綍")
+
+ public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
+ AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
+ 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 + "\\";
+ String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+ tjReport.setReport(pdfBinary);
+ tjReport.setType("浣撴鎶ュ憡");
+ tjReport.setPrint("pdf");
+ tjReportService.save(tjReport);
+// Date date = new Date();
+// tjOrder.setStatus(TjConstants.TJ_END);
+// tjOrder.setReportTime(date);
+// tjOrder.setPrintLastTime(date);
+// tjOrder.setDownloadLastTime(date);
+// tjOrderService.updateById(tjOrder);
+ }
+ return ajaxResult;
+ }
+
+ @GetMapping("/getHistryTjOrderByCusIdCard")
+ @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴璁板綍")
@Transactional
public AjaxResult getHistryTjOrderByCusIdCard(@RequestParam String cusIdCard) {
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
@@ -2431,8 +2441,8 @@
}
- @GetMapping ("/getHistryTjOrderProByCusIdCard")
- @ApiOperation (value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍")
+ @GetMapping("/getHistryTjOrderProByCusIdCard")
+ @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍")
@Transactional
public AjaxResult getHistryTjOrderProByCusIdCard(@RequestParam String cusIdCard) {
TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
@@ -2491,8 +2501,8 @@
}
- @GetMapping ("/getHistryTjOrderByCusId")
- @ApiOperation (value = "鏍规嵁瀹㈡埛id鏌ョ湅鍘嗗彶浣撴璁板綍")
+ @GetMapping("/getHistryTjOrderByCusId")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛id鏌ョ湅鍘嗗彶浣撴璁板綍")
@Transactional
public AjaxResult getHistryTjOrderByCusId(@RequestParam String cusId) {
TjCustomer tjCustomer = tjCustomerService.getById(cusId);
@@ -2526,10 +2536,10 @@
}
- @GetMapping ("/revokeTjOrderByTjNum")
- @ApiOperation (value = "鏍规嵁瀹㈡埛浣撴鍙锋挙閿�浣撴璁板綍")
+ @GetMapping("/revokeTjOrderByTjNum")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋挙閿�浣撴璁板綍")
@Transactional
- public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
+ public AjaxResult revokeTjOrderByTjNum(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -2548,31 +2558,31 @@
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());
- map.put("input", customer.getPationId());
- 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);
- } else {
+
+ 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("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
}
}
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ if (zfHisApiMethods) {
+ return AjaxResult.success("鎾ら攢鎴愬姛");
+ } else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+
}
return AjaxResult.success("鎾ら攢鎴愬姛!!!");
}
@@ -2580,14 +2590,14 @@
}
- @GetMapping ("/getCusTomterListByCompId")
- @ApiOperation (value = "鑾峰彇鍗曚綅id浣撴浜轰俊鎭帴鍙�")
- public AjaxResult getCusTomterListByCompId(@RequestParam (required = false) @ApiParam (value = "鍗曚綅id") String compId,
- @RequestParam (required = false) @ApiParam (value = "鍚嶅瓧") String name,
- @RequestParam (required = false) @ApiParam (value = "閮ㄩ棬id") String deptId,
- @RequestParam (required = false) @ApiParam (value = "棰勭害鏃堕棿") Date reservationTime,
- @RequestParam (defaultValue = "1") Integer page,
- @RequestParam (defaultValue = "10") Integer pageSize) {
+ @GetMapping("/getCusTomterListByCompId")
+ @ApiOperation(value = "鑾峰彇鍗曚綅id浣撴浜轰俊鎭帴鍙�")
+ public AjaxResult getCusTomterListByCompId(@RequestParam(required = false) @ApiParam(value = "鍗曚綅id") String compId,
+ @RequestParam(required = false) @ApiParam(value = "鍚嶅瓧") String name,
+ @RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId,
+ @RequestParam(required = false) @ApiParam(value = "棰勭害鏃堕棿") Date reservationTime,
+ @RequestParam(defaultValue = "1") Integer page,
+ @RequestParam(defaultValue = "10") Integer pageSize) {
Page<TjReservation> pages = new Page<>(page, pageSize);
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
if (null != compId) wq.eq(TjReservation::getCompanyId, compId);
@@ -2613,10 +2623,10 @@
}
- @PostMapping ("/plRevokeTjOrderByTjNum")
- @ApiOperation (value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
+ @PostMapping("/plRevokeTjOrderByTjNum")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
@Transactional
- public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam (value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
+ public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
if (null != reservationIds && reservationIds.size() > 0) {
LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
wq1.in(TjOrder::getReservationId, reservationIds);
@@ -2650,8 +2660,8 @@
return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勪汉鍛�!");
}
- @PostMapping ("makeTjPDF")
- @ApiOperation (value = "鎵归噺鐢熸垚PDF")
+ @PostMapping("makeTjPDF")
+ @ApiOperation(value = "鎵归噺鐢熸垚PDF")
public AjaxResult makeTjPDF(@RequestBody List<String> reservations) {
QueryWrapper<TjOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.in("reservation_id", reservations);
@@ -2693,11 +2703,11 @@
}
- @GetMapping ("/delTbBycusCardIdAndProId")
- @ApiOperation (value = "鏍规嵁瀹㈡埛韬唤璇佸彿鍜岄」鐩埗椤筰d鍒犻櫎涓存椂琛ㄦ暟鎹�")
+ @GetMapping("/delTbBycusCardIdAndProId")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛韬唤璇佸彿鍜岄」鐩埗椤筰d鍒犻櫎涓存椂琛ㄦ暟鎹�")
@Transactional
- public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam (value = "韬唤璇佸彿") String cusCardId,
- @RequestParam @ApiParam (value = "鐖堕」id") String proId) {
+ public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "韬唤璇佸彿") String cusCardId,
+ @RequestParam @ApiParam(value = "鐖堕」id") String proId) {
if (transitionService.delTbBycusCardIdAndProId(cusCardId, proId)) {
return AjaxResult.success();
@@ -2706,10 +2716,10 @@
}
- @GetMapping ("/revokeTjOrderByTjCardId")
- @ApiOperation (value = "鏍规嵁灏辫瘖鍙锋挙閿�鐢宠璁板綍")
+ @GetMapping("/revokeTjOrderByTjCardId")
+ @ApiOperation(value = "鏍规嵁灏辫瘖鍙锋挙閿�鐢宠璁板綍")
@Transactional
- public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam (value = "灏辫瘖鍙�") String cardId) {
+ public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
TjOrder order = new TjOrder();
order.setCardId(cardId);
@@ -2744,10 +2754,10 @@
}
- @GetMapping ("/revokeTjOrderByTjh")
- @ApiOperation (value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
+ @GetMapping("/revokeTjOrderByTjh")
+ @ApiOperation(value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
@Transactional
- public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
+ public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -2765,10 +2775,10 @@
}
- @GetMapping ("/getBlproByTjh")
- @ApiOperation (value = "鏍规嵁浣撴鍙疯幏鍙栬ˉ褰曢」鐩褰�")
+ @GetMapping("/getBlproByTjh")
+ @ApiOperation(value = "鏍规嵁浣撴鍙疯幏鍙栬ˉ褰曢」鐩褰�")
@Transactional
- public AjaxResult getBlproByTjh(@RequestParam @ApiParam (value = "浣撴鍙�") String tjNum) {
+ public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
@@ -2799,8 +2809,8 @@
}
- @PostMapping ("/revokeBlProByBldhAndTjh")
- @ApiOperation (value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
+ @PostMapping("/revokeBlProByBldhAndTjh")
+ @ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
@Transactional
public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
@@ -2828,6 +2838,12 @@
if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
}
+
+ }
+ boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
+ if (!b) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
}
}
for (String bldh : dto.getBldhs()) {
@@ -2843,15 +2859,15 @@
}
- @PostMapping ("/addYaoPinShenQing")
- @ApiOperation (value = "鑽搧淇℃伅鐢宠")
+ @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("200")) {
+ if (null != code && code.equals("0")) {
}
return AjaxResult.success();
--
Gitblit v1.8.0