From 02ced282179511ba05d50baf63ac74b53ec71f93 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期四, 13 六月 2024 15:50:02 +0800
Subject: [PATCH] 撤销调用his作废
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 420 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 268 insertions(+), 152 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 e2dc3e3..baf6870 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
@@ -4,11 +4,14 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.OffsetTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.concurrent.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.annotation.Resource;
@@ -22,15 +25,20 @@
import cn.hutool.extra.pinyin.PinyinUtil;
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.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.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
+import com.ltkj.common.utils.PDFDocumentUtil;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
+import com.ltkj.framework.config.ThreadPoolConfig;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
@@ -53,6 +61,9 @@
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.HisMzJysqController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -61,8 +72,10 @@
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.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
@@ -160,6 +173,16 @@
private LtkjMiddleHeadService headService;
@Resource
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
+ @Autowired
+ private ThreadPoolConfig threadPoolConfig;
+
+ @Autowired
+ private HisApiMethod hisApiMethod;
+
+ @Autowired
+ private HisMzJysqController hisMzJysqController;
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
/**
@@ -841,8 +864,8 @@
wq1.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq1);
MallOrder mallOrder = null;
- if (tjReservation != null) {
- order.setReservationId(tjReservation.getId());
+ 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("鏈埌棰勭害鏃堕棿");
@@ -897,6 +920,7 @@
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
if (tjOrderService.save(tjOrder)) {
+
//淇濆瓨鏀惰揣鍦板潃
if ("2".equals(tjOrder.getGetType())) {
final TjReportGetAddress address = tjOrder.getAddAddress();
@@ -1004,8 +1028,16 @@
//
// }
// }
+
+
+ /*璋冪敤his鎺ュ彛*/
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if(null !=config && config.equals("Y")){
+ hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
+ }
tjCustomer.setCardId("0");
tjCustomerService.updateById(tjCustomer);
+
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1015,9 +1047,10 @@
@PostMapping("/addPlOrderAndDetail")
@ApiOperation(value = "浣撴鎵归噺绛惧埌鐧昏鎺ュ彛")
@Transactional //(鍒囨崲鏁版嵁搴撳嚭閿欙紝鎵�浠ユ敞閲�)
- public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto) {
+ 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) {
ExecutorService threadPools = Executors.newFixedThreadPool(cusIds.size());
for (String cusId : cusIds) {
@@ -1032,21 +1065,78 @@
wq.in(TjCustomer::getCusIdcard, cusIds);
List<Long> list = tjCustomerService.list(wq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
if (list.size() > 0) {
- ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
+// ExecutorService threadPool = Executors.newFixedThreadPool(list.size());
+ ThreadPoolTaskExecutor executor = threadPoolConfig.threadPoolTaskExecutor();
for (Long aLong : list) {
- threadPool.execute(new Runnable() {
+// threadPool.execute(new Runnable() {
+// @Override
+// public void run() {
+// try {
+// AjaxResult result = getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
+// threadPool.shutdown();
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+// }
+// });
+ Future<AjaxResult> future = executor.submit(new Callable<AjaxResult>() {
@Override
- public void run() {
- try {
- getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
- threadPool.shutdown();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ public AjaxResult call() throws Exception {
+ return getAjaxResult(aLong, sysUser, daoDto.getTjCategory());
}
});
+ try {
+ AjaxResult result = future.get();
+ String tjNumber = result.get("tjNumber").toString();
+ tjNumbers.add(tjNumber);
+ } catch (InterruptedException | ExecutionException e) {
+ e.printStackTrace();
+ }
+ }
+ threadPools.shutdown();
+ }
+ }
+ // TODO 鍥犱负鏈変綋妫�鍙蜂細鏌ュ嚭绌烘暟鎹� 鍏堜娇鐢ㄦ鏁版嵁
+ tjNumbers = new ArrayList<>();
+ tjNumbers.add("02095240229171627");
+ tjNumbers.add("02095240229173104");
+ tjNumbers.add("10001240524172002");
+ tjNumbers.add("10001240304124410");
+ tjNumbers.add("00325240304160123");
+ tjNumbers.add("02095240304162044");
+ tjNumbers.add("02095240304162152");
+ tjNumbers.add("10001240304163505");
+ Map<String, Object> map = null;
+ try {
+ map = PDFDocumentUtil.getDocument();
+ Document document = (Document) map.get("document");
+ for (int i = 0; i < tjNumbers.size(); i++) {
+ try {
+ List<Map<String, String>> djdInfos = tjOrderService.selectDjdInfo(tjNumbers.get(i));
+ Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumbers.get(i));
+ LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+ String time = null;
+ if (tjsj != null) {
+ time = dateFormat.format(tjsj);
+ }
+ 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) {
+ 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) {
+ e.printStackTrace();
}
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
@@ -1240,152 +1330,110 @@
}
tjReservation.setIsExpire(1);
tjReservationService.updateById(tjReservation);
-// if (null != tjReservation.getTeamNo()) {
-// tjOrder.setTjType("1");
-// } else {
-// tjOrder.setTjType("2");
-// }
- }
- //鐢熸垚浣撴鍙�
- String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
- tjNumber = tjNumber.replaceAll(".{4}$", userId.toString().substring(userId.toString().length() - 4));
+ //鐢熸垚浣撴鍙�
+ String tjNumber = (sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
- tjOrder.setTjNumber(tjNumber);
- if (null != tjOrder.getPhoto()) {
- File file = new File(tjOrder.getPhoto());
- if (file.isFile()) {
- FileInputStream fileInputStream = new FileInputStream(file);
- byte[] bytes = new byte[fileInputStream.available()];
- fileInputStream.read(bytes); // 璇诲彇鍒� byte 閲岄潰
- fileInputStream.close();
- // 寰楀埌鏂囦欢 涔嬪悗杞垚beye 鐒跺悗浣跨敤base64杞爜
- String encode = Base64.encode(bytes);
- tjOrder.setPhoto(encode);
- }
- }
- if (tjOrder.getFirmId() == null) {
- tjOrder.setFirmId("0");
- }
- if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
- tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
- }
- //鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
- if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
- tjOrder.setStatus(TjConstants.TJ_BEGIN);
- tjOrder.setCardId(tjCustomer.getCardId());
- tjOrder.setTjType("1");
- if (tjOrderService.save(tjOrder)) {
- //淇濆瓨鏀惰揣鍦板潃
- if ("2".equals(tjOrder.getGetType())) {
- final TjReportGetAddress address = tjOrder.getAddAddress();
- if (address != null) {
- address.setTjNumber(tjNumber);
- tjReportGetAddressService.save(address);
+ tjNumber = tjNumber.replaceAll(".{4}$", userId.toString().substring(userId.toString().length() - 4));
+
+ tjOrder.setTjNumber(tjNumber);
+ if (null != tjOrder.getPhoto()) {
+ File file = new File(tjOrder.getPhoto());
+ if (file.isFile()) {
+ FileInputStream fileInputStream = new FileInputStream(file);
+ byte[] bytes = new byte[fileInputStream.available()];
+ fileInputStream.read(bytes); // 璇诲彇鍒� byte 閲岄潰
+ fileInputStream.close();
+ // 寰楀埌鏂囦欢 涔嬪悗杞垚beye 鐒跺悗浣跨敤base64杞爜
+ String encode = Base64.encode(bytes);
+ tjOrder.setPhoto(encode);
}
}
- 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);
- }
+ if (tjOrder.getFirmId() == null) {
+ tjOrder.setFirmId("0");
}
-
- //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
- //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
- String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
- String isPay = configService.selectConfigByKey("isPay");
- if ("Y".equals(getInfoFromSqlData)) {
- LtkjMiddleHead middleHead = headService.getMiddleHeadByPartId(tjCustomer.getCardId());
- if (null != middleHead) {
- tjFlowingWater.setPayStasus(1L);
- }
+ if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
+ tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
}
- tjFlowingWater.setOrderId(tjOrder.getOrderId());
- Date date1 = new Date(System.currentTimeMillis());
- String s1 = sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
- tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+ //鍒ゆ柇灏忕▼搴忎笂棰勭害鏄惁浠橀挶
+ if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
+ tjOrder.setStatus(TjConstants.TJ_BEGIN);
+ tjOrder.setCardId(tjCustomer.getCardId());
+ tjOrder.setTjType("1");
+ if (tjOrderService.save(tjOrder)) {
-// 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 ("2".equals(tjOrder.getGetType())) {
+ final TjReportGetAddress address = tjOrder.getAddAddress();
+ if (address != null) {
+ address.setTjNumber(tjNumber);
+ tjReportGetAddressService.save(address);
}
- } else {
-// tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
-// tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
-// tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
-// tjFlowingWater.setPayStasus(0L);
}
+ 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 (tjReservation.getPayType() == 1) {
+ tjFlowingWater.setPayStasus(3L);
+ }
+ }
+
+ //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
+ //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
+ String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ 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 = sysUser.getUserName() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
+ tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+
+ 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 (tjFlowingWaterService.save(tjFlowingWater)) {
+ tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ tjOrderService.updateById(tjOrder);
+
+
+ }
+ asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+
+
+ tjCustomer.setCardId("0");
+ tjCustomerService.updateById(tjCustomer);
+ return AjaxResult.success().put("tjNumber",tjNumber);
}
- 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();
-// }
-// }
-// }
-//
-// }
-// }
- tjCustomer.setCardId("0");
- tjCustomerService.updateById(tjCustomer);
- return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
}
@@ -1483,7 +1531,7 @@
if (null != ppList && ppList.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴�
// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
- asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
+ asyncService.saveRedisTransitionByPacId(cusId,cardId, pacId, null);
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
@@ -1528,7 +1576,7 @@
//鍗曢」
if (null != proIds && proIds.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴撹〃
- asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
+ asyncService.saveRedisTransitionByPacId(cusId,cardId,null, proIds);
for (Long proId : proIds) {
List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null != transitions && transitions.size() > 0) {
@@ -2275,6 +2323,33 @@
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
transitionService.updateTbTransitionByTjNum(tjNum);
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (configByKey.equals("Y")){
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("cardtype","4");
+ map.put("input",order.getCardId());
+ LocalDate currentDate = LocalDate.now();
+ LocalDateTime startOfDay = currentDate.atStartOfDay();
+ LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String ksrq = startOfDay.format(formatter);
+ String jsrq = nineteenOClock.format(formatter);
+ map.put("ksrq",ksrq);
+ map.put("jsrq",jsrq);
+ AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
+ if (Integer.parseInt(String.valueOf(result.get("code"))) == 200){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
+ }else {
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ if (zfHisApiMethods) {
+ return AjaxResult.success("鎾ら攢鎴愬姛", map);
+ }else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+ }
+ }
return AjaxResult.success("鎾ら攢鎴愬姛!!!");
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
@@ -2340,7 +2415,7 @@
}
for (String id : reservationIds) {
TjReservation reservation = tjReservationService.getById(id);
- if(null !=reservation){
+ if (null != reservation) {
reservation.setIsExpire(2);
tjReservationService.updateById(reservation);
}
@@ -2351,5 +2426,46 @@
return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勪汉鍛�!");
}
+ @PostMapping("makeTjPDF")
+ @ApiOperation(value = "鎵归噺鐢熸垚PDF")
+ public AjaxResult makeTjPDF(@RequestBody List<String> reservations) {
+ QueryWrapper<TjOrder> queryWrapper = new QueryWrapper<>();
+ queryWrapper.in("reservation_id",reservations);
+ List<TjOrder> tjNumbers = tjOrderService.list(queryWrapper);
+ Map<String, Object> map = null;
+ try {
+ map = PDFDocumentUtil.getDocument();
+ Document document = (Document) map.get("document");
+ for (int i = 0; i < tjNumbers.size(); i++) {
+ String tjNumber = tjNumbers.get(i).getTjNumber();
+ try {
+ List<Map<String, String>> djdInfos = tjOrderService.selectDjdInfo(tjNumber);
+ Map<String, Object> userInfo = tjOrderService.selectDjdUserInfo(tjNumber);
+ LocalDateTime tjsj = (LocalDateTime) userInfo.get("tjsj");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+ 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) {
+ 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) {
+ e.printStackTrace();
+ return AjaxResult.error(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0