From 2c19fa65dc87ea8f3d81f84154f4eeabff7f8d00 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 05 六月 2025 12:36:47 +0800
Subject: [PATCH] zjh20250605
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 726 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 423 insertions(+), 303 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 40d0ced..ed951a1 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
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
@@ -125,8 +126,8 @@
private ITbTransitionService transitionService;
@Resource
private ISysConfigService configService;
- @Value("${path.filePath}")
- private String value;
+// @Value("${path.filePath}")
+// private String value;
@Resource
private ITjOrderRemarkService remarkService;
@Resource
@@ -642,82 +643,6 @@
@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);
- cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
- }
- Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
- LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
- 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.like(TjOrder::getTjNumber, tjNum);
- }
- 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) {
- 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(tjCustomer.getCusName());
- list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
- if (tjCustomer.getCusIdcard() != null) {
- list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
- }
-
- 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())) {
- 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());
-// }
- }
- }
- map.put("list", list);
- 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);
@@ -920,16 +845,236 @@
}
- /**
- * 瀵煎嚭浣撴璁板綍鍒楄〃
- */
-// @PreAuthorize("@ss.hasPermi('hosp:order:export')")
- @Log(title = "浣撴璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
+
+
+ @PostMapping("/exportOrderList")
@ApiOperation(value = "瀵煎嚭浣撴璁板綍鍒楄〃")
- public void export(HttpServletResponse response, TjOrder tjOrder) {
- //List<TjOrder> list = tjOrderService.selectTjOrderList(tjOrder);
- List<TjOrder> list = tjOrderService.selectExportOrderList(tjOrder);
+ public void exportOrderList(@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) String dw,
+ @ApiParam(value = "褰撳墠椤垫垨鍏ㄩ儴鏁版嵁") @RequestParam(required = false) String dqyorqbsj,
+ HttpServletResponse response) {
+ List<Long> cusIds = null;
+ if (null != name) {
+ LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
+ wqq.like(TjCustomer::getCusName, name);
+ 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) {
+ wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
+ }
+ if (null != bgbeginTime && null != bgendTime) {
+ wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(bgbeginTime), DateUtil.endOfDay(bgendTime));
+ }
+ 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()));
+ }
+ }
+ }
+ }
+ ExcelUtil<TjOrder> util = new ExcelUtil<TjOrder>(TjOrder.class);
+ util.exportExcel(response, tjOrders, "浣撴璁板綍鏁版嵁");
+ }
+
+ 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);
+
+ List<TjOrder> list =null;
+ if(StringUtil.isNotBlank(dqyorqbsj) && dqyorqbsj.equals("1")){
+ list = tjOrderService.list(wq);
+ }else {
+ Page<TjOrder> page2 = tjOrderService.page(page1, wq);
+ list = page2.getRecords();
+ }
+ if (!list.isEmpty()) {
+ for (TjOrder order : list) {
+ 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()));
+ 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 != 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("宸叉墦鍗�");
+ }
+ }
+ }
+ }
ExcelUtil<TjOrder> util = new ExcelUtil<TjOrder>(TjOrder.class);
util.exportExcel(response, list, "浣撴璁板綍鏁版嵁");
}
@@ -1015,8 +1160,9 @@
if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
if (null != tjReservation.getTjCategory()) tjOrder.setTjCategory(tjReservation.getTjCategory());
if (null != tjReservation.getGroupingId()) {
+ TjDwGrouping dwGrouping = dwGroupingService.getById(tjReservation.getGroupingId());
tjOrder.setGroupId(tjReservation.getGroupingId());
- tjOrder.setFirmDeptId(tjReservation.getPacId());
+ tjOrder.setFirmDeptId(dwGrouping.getDwDeptId());
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
@@ -1069,6 +1215,7 @@
return result;
}
}catch (Exception e){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
log.error(String.valueOf(e));
}
finally {
@@ -1077,7 +1224,8 @@
return AjaxResult.error();
}
- @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
+// @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
//鑾峰彇鎷兼帴鍓嶇紑
@@ -1226,6 +1374,23 @@
/*璋冪敤his鎺ュ彛*/
String config = configService.selectConfigByKey("sfkqdyhis");
if (null != config && config.equals("Y")) {
+ if(tjCustomer.getPationId().equals("0")){
+ AjaxResult result = controller.Outpincreateapply(tjCustomer);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (code.equals("0")) {
+ JSONArray resultDatass = object.getJSONArray("ResultData");
+ Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
+ if (null != resultData && !resultData.isEmpty()) {
+ String pationid = resultData.get("PationId").toString();
+ if (null != pationid) {
+ tjCustomer.setPationId(pationid);
+ tjCustomerService.updateById(tjCustomer);
+ }
+ }
+ }
+ }
AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder);
if (!result.get("code").toString().equals("200")) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -1234,45 +1399,39 @@
hisApiMethod.ZfHisApiMethod(jzh.toString());
}
log.info("璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
- return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+ throw new IllegalStateException("鎸傚彿澶辫触!" + 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());
+ try {
+ 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());
+ }
+ } catch (Exception e) {
+ log.error("鍙戠敓閿欒 ->{}"+String.valueOf(e),e.getMessage());
+ throw new IllegalStateException();
}
return AjaxResult.success(tjNumber);
} else {
@@ -1371,24 +1530,35 @@
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);
+ try {
+ 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);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ throw new IllegalStateException(e);
+ }
} else {
- log.info(tjOrder.getTjNumber()+"else绛惧埌鐧昏杩涘叆鏀惰垂鏂规硶");
- newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
- AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
- if (error != null) return error;
+ try {
+ log.info(tjOrder.getTjNumber()+"else绛惧埌鐧昏杩涘叆鏀惰垂鏂规硶");
+ newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+ isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
+ } catch (Exception e) {
+ log.error("processOrderWithTransaction 鏂规硶寮傚父"+e.getMessage());
+ throw new RuntimeException("璋冪敤鍏叡鏂规硶澶辫触 寮哄埗瑙﹀彂鍥炴粴");
+// return AjaxResult.error();
+ }
+// if (error != null) return error;
// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
}
@@ -1397,11 +1567,12 @@
// pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
// return AjaxResult.success(tjNumber);
}
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ throw new RuntimeException("浣撴璁板綍淇濆瓨澶辫触 寮哄埗瑙﹀彂鍥炴粴");
}
- private AjaxResult isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
+ public void 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");
@@ -1463,13 +1634,16 @@
}
tjFlowingWaterService.updateById(tjFlowingWater);
} else {
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return AjaxResult.error();
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.error("isRequestCommonHisApi 鏂规硶寮傚父");
+ throw new RuntimeException("is_request_common_his_api 寮哄埗瑙﹀彂鍥炴粴");
+// return AjaxResult.error();
}
}
- return null;
+// return null;
}
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
try {
String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
@@ -1595,12 +1769,17 @@
if (null != cusIds && !cusIds.isEmpty()) {
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
- threadPools.execute(new Runnable() {
- @Override
- public void run() {
- getAjaxResults(cusId);
- }
- });
+
+// threadPools.execute(new Runnable() {
+// @Override
+// public void run() {
+ try {
+ getAjaxResults(cusId);
+ } catch (Exception e) {
+
+ }
+// }
+// });
}
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.in(TjCustomer::getCusIdcard, cusIds);
@@ -1645,73 +1824,12 @@
threadPools.shutdown();
}
// TODO 鍥犱负鏈変綋妫�鍙蜂細鏌ュ嚭绌烘暟鎹� 鍏堜娇鐢ㄦ鏁版嵁 鎵撳嵃瀵艰瘖鍗�
+ Map<String,Object> map=new HashMap<>();
if (!tjNumbers.isEmpty()) {
- /* Map<String, Object> map = null;
- try {
- 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();
- }
- }
-
-// }
- 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);
}
- if (!errTjh.isEmpty()){
- Map<String,Object> map=new HashMap<>();
- map.put("errtjh",errTjh);
- return AjaxResult.success("浠ヤ笂浜哄憳绛惧埌澶辫触",map);
- }
- return AjaxResult.success();
+ map.put("errtjh",errTjh);
+ return AjaxResult.success("鎿嶄綔鎴愬姛",map);
}
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error();
@@ -1790,51 +1908,59 @@
tjReservationService.updateById(tjReservation);
// return AjaxResult.error("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
}*/
- LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
- qw.eq(TjCustomer::getCusIdcard, cusIdcard);
- TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
- if (tjCustomer1 != null) {
- tjCustomer1.setTjType(tjReservation.getTjType());
- tjCustomer1.setCusName(tjReservation.getName());
- tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer1.setCusBrithday(tjReservation.getBirthday());
- tjCustomer1.setCusPhone(tjReservation.getPhoe());
- tjCustomer1.setCusEmail(tjReservation.getEmail());
- tjCustomer1.setCusAddr(tjReservation.getAddress());
- tjCustomer1.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
- tjCustomer1.setCusNational(String.valueOf(tjReservation.getNation()));
- tjCustomer1.setIdType(tjReservation.getIdType());
- tjCustomer1.setAge(tjReservation.getAge());
- tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
- tjCustomer1.setCareer(tjReservation.getCareer());
- tjCustomerService.updateById(tjCustomer1);
- } else {
- TjCustomer tjCustomer = new TjCustomer();
- tjCustomer.setCusIdcard(tjReservation.getIdCard());
- tjCustomer.setCusName(tjReservation.getName());
- tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
- tjCustomer.setCusBrithday(tjReservation.getBirthday());
- tjCustomer.setCusPhone(tjReservation.getPhoe());
- tjCustomer.setCusEmail(tjReservation.getEmail());
- tjCustomer.setCusAddr(tjReservation.getAddress());
- tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
- tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
- tjCustomer.setIdType(tjReservation.getIdType());
- tjCustomer.setAge(tjReservation.getAge());
- tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
- tjCustomer.setCareer(tjReservation.getCareer());
- tjCustomer.setDwPhone(tjReservation.getDwPhone());
- tjCustomer.setCardId(tjReservation.getCardId());
- tjCustomer.setIndexCard(tjReservation.getIndexCard());
- //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
- String substring = cusIdcard.substring(cusIdcard.length() - 6);
- substring = DigestUtils.md5DigestAsHex(substring.getBytes());
- tjCustomer.setCusPassword(substring);
- tjCustomer.setTjType(tjReservation.getTjType());
- tjCustomerService.save(tjCustomer);
+ try {
+ LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
+ qw.eq(TjCustomer::getCusIdcard, cusIdcard);
+ TjCustomer tjCustomer1 = tjCustomerService.getOne(qw);
+ if (tjCustomer1 != null) {
+ tjCustomer1.setTjType(tjReservation.getTjType());
+ tjCustomer1.setCusName(tjReservation.getName());
+ tjCustomer1.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer1.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer1.setCusPhone(tjReservation.getPhoe());
+ tjCustomer1.setCusEmail(tjReservation.getEmail());
+ tjCustomer1.setCusAddr(tjReservation.getAddress());
+ tjCustomer1.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer1.setCusNational(String.valueOf(tjReservation.getNation()));
+ tjCustomer1.setIdType(tjReservation.getIdType());
+ tjCustomer1.setAge(tjReservation.getAge());
+ tjCustomer1.setAgeUnit(tjReservation.getAgeUnit());
+ tjCustomer1.setCareer(tjReservation.getCareer());
+ tjCustomerService.updateById(tjCustomer1);
+ } else {
+ TjCustomer tjCustomer = new TjCustomer();
+ tjCustomer.setCusIdcard(tjReservation.getIdCard());
+ tjCustomer.setCusName(tjReservation.getName());
+ tjCustomer.setCusSex(Long.valueOf(tjReservation.getSex()));
+ tjCustomer.setCusBrithday(tjReservation.getBirthday());
+ tjCustomer.setCusPhone(tjReservation.getPhoe());
+ tjCustomer.setCusEmail(tjReservation.getEmail());
+ tjCustomer.setCusAddr(tjReservation.getAddress());
+ tjCustomer.setCusMarryStatus(String.valueOf(tjReservation.getMarriage()));
+ tjCustomer.setCusNational(String.valueOf(tjReservation.getNation()));
+ tjCustomer.setIdType(tjReservation.getIdType());
+ tjCustomer.setAge(tjReservation.getAge());
+ tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
+ tjCustomer.setCareer(tjReservation.getCareer());
+ tjCustomer.setDwPhone(tjReservation.getDwPhone());
+ tjCustomer.setCardId(tjReservation.getCardId());
+ tjCustomer.setIndexCard(tjReservation.getIndexCard());
+ //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
+ String substring = cusIdcard.substring(cusIdcard.length() - 6);
+ substring = DigestUtils.md5DigestAsHex(substring.getBytes());
+ tjCustomer.setCusPassword(substring);
+ tjCustomer.setTjType(tjReservation.getTjType());
+ tjCustomerService.save(tjCustomer);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
+ }else {
+ throw new RuntimeException();
}
+ }else {
+ throw new RuntimeException();
}
}
@@ -2073,7 +2199,6 @@
xdPictureService.saveBatch(xdPictureList);
List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
-// return AjaxResult.success(tjNumber);
}
tjCustomer.setCardId("0");
@@ -2866,46 +2991,51 @@
}
+ @Transactional(propagation = Propagation.REQUIRED) // 鍏变韩浜嬪姟
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()), tjOrder.getCardId(), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- } else {
- tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
- }
+ try {
+ 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()), 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()), tjOrder.getCardId());
+ 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()));
+ //娣诲姞remark琛ㄦ暟鎹�
+ if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
+ remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
- } else {
- remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
+ } else {
+ 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) {
+ }
+ //鍒ゆ柇鏄惁浜ら挶
+ 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());
+ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+ xdPictureService.saveBatch(xdPictureList);
+ }
+ }
+ if (tjFlowingWater.getPayStasus() == 1L) {
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
+ tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
+ tjFlowingWater.setPayType(4L);
+ tjFlowingWaterService.updateById(tjFlowingWater);
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);
}
- }
- if (tjFlowingWater.getPayStasus() == 1L) {
- tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
- sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
- tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
- tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
- tjFlowingWater.setPayType(4L);
- tjFlowingWaterService.updateById(tjFlowingWater);
- 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);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
}
@@ -3090,9 +3220,9 @@
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);
+// String outputPath1 = value + File.separator;
+// String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
+// tjReport.setReport(pdfBinary);
tjReport.setType("浣撴鎶ュ憡");
tjReport.setPrint("pdf");
tjReportService.save(tjReport);
@@ -3977,16 +4107,6 @@
@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);
}
--
Gitblit v1.8.0