From 7d702f59202496e28a80582b4aeeab2a9b9da76d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 14 十月 2024 15:05:16 +0800
Subject: [PATCH] 修改判断是否需要lis、pacs

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |  755 +++++++++++++++++++++++++++++++++------------------------
 1 files changed, 435 insertions(+), 320 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 bc26c5f..d3e61e3 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,23 @@
 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 com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
 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 +103,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 +112,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 +138,7 @@
     private ITbTransitionService transitionService;
     @Resource
     private ISysConfigService configService;
-    @Value ("${path.filePath}")
+    @Value("${path.filePath}")
     private String value;
     @Resource
     private ITjOrderRemarkService remarkService;
@@ -133,61 +146,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 +192,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 +228,8 @@
      * 鏌ヨ浣撴璁板綍鍒楄〃
      */
 //    @PreAuthorize("@ss.hasPermi('hosp:order:list')")
-    @GetMapping ("/list")
-    @ApiOperation (value = "鏌ヨ浣撴璁板綍鍒楄〃(榛樿)")
+    @GetMapping("/list")
+    @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃(榛樿)")
     public TableDataInfo list(TjOrder tjOrder) {
         startPage();
         startOrderBy();
@@ -251,16 +262,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,17 +391,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) 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) {
+    @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<>();
@@ -490,8 +501,7 @@
                 if (null != order.getPacId()) {
                     if (null != tjPackageService.getById(order.getPacId())) {
                         order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
-                    }else
-                    if (null != dwDeptService.getById(order.getPacId())) {
+                    } else if (null != dwDeptService.getById(order.getPacId())) {
                         order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
                     }
                 }
@@ -503,14 +513,14 @@
     }
 
 
-    @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<>();
@@ -579,13 +589,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) {
@@ -632,15 +642,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) {
@@ -831,9 +841,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);
@@ -845,15 +855,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"));
@@ -865,12 +875,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);
@@ -892,7 +908,6 @@
             transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
             return AjaxResult.error("涓嶅彲閲嶅鐧昏");
         }
-
         TjFlowingWater tjFlowingWater = new TjFlowingWater();
         LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
         wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
@@ -902,10 +917,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(DateUtil.offsetDay(tjReservation.getReservationTime(),tjReservation.getYxts())).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("瀵逛笉璧锋偍鐨勯绾﹀凡瓒呮椂璇烽噸鏂伴绾�");
@@ -920,7 +935,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()) {
@@ -929,9 +944,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()) {
@@ -958,145 +971,162 @@
             tjOrder.setFinishTime(new Date());
             tjOrder.setCheckStatus(1);
             tjOrder.setStatus(TjConstants.TJ_WAIT);
-            tjFlowingWater.setPayStasus(1L);
+            //            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()));
+        try {
+            boolean b = lock.tryLock(3, TimeUnit.MINUTES);
+            if(b){
+                //鐢熸垚浣撴鍙�
+                String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+                tjOrder.setTjNumber(tjNumber);
 
-            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());
-
-            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 (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());
+                    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);
+                        }
                     }
-                    return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+                    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
+//                        if (isUseLisAndPacsRegister(tjOrder)) {
+//                          hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"),tjOrder,sysUser,result);
+//                        }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);
                 }
 
-                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);
-                }
-                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);
+                return AjaxResult.error();
             }
-
-
-            //鍥綋
-            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);
+        } 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() {
@@ -1109,7 +1139,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) {
@@ -1488,9 +1518,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));
     }
@@ -1499,16 +1529,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);
@@ -1528,8 +1558,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");
@@ -1584,9 +1614,9 @@
     }
 
 
-    @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);
@@ -1601,16 +1631,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<>();
@@ -1719,9 +1749,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);
@@ -1746,8 +1776,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());
@@ -1812,7 +1842,6 @@
                 dto.setJzqk(9);
                 controller.Outpinimpapply(dto);
             }*/
-
             return AjaxResult.success("绛剧鎴愬姛锛�");
         } else {
             return getAjaxResult(tjNumber);
@@ -1823,10 +1852,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);
     }
 
@@ -1834,9 +1863,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();
         }
@@ -2003,15 +2032,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;
@@ -2076,11 +2105,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<>();
 
@@ -2139,8 +2168,8 @@
     }
 
 
-    @PostMapping ("/tuanTiBingChart")
-    @ApiOperation (value = "鏌ヨ鍥綋浣撴鐥呯缁熻鍥�")
+    @PostMapping("/tuanTiBingChart")
+    @ApiOperation(value = "鏌ヨ鍥綋浣撴鐥呯缁熻鍥�")
     public AjaxResult tuanTiBingChart(@RequestBody BingZhongVO bingZhongVO) {
         List<TjOrderDetailRules> res1 = new ArrayList<>();
 
@@ -2179,18 +2208,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)
@@ -2250,12 +2279,13 @@
     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());
+            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.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")) {
@@ -2279,30 +2309,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);
         }
     }
 
 
-    @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);
@@ -2322,8 +2435,8 @@
     }
 
 
-    @GetMapping ("/getHistryTjOrderProByCusIdCard")
-    @ApiOperation (value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍")
+    @GetMapping("/getHistryTjOrderProByCusIdCard")
+    @ApiOperation(value = "鏍规嵁韬唤璇佸彿鏌ョ湅鍘嗗彶浣撴椤圭洰璁板綍")
     @Transactional
     public AjaxResult getHistryTjOrderProByCusIdCard(@RequestParam String cusIdCard) {
         TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdCard);
@@ -2382,8 +2495,8 @@
     }
 
 
-    @GetMapping ("/getHistryTjOrderByCusId")
-    @ApiOperation (value = "鏍规嵁瀹㈡埛id鏌ョ湅鍘嗗彶浣撴璁板綍")
+    @GetMapping("/getHistryTjOrderByCusId")
+    @ApiOperation(value = "鏍规嵁瀹㈡埛id鏌ョ湅鍘嗗彶浣撴璁板綍")
     @Transactional
     public AjaxResult getHistryTjOrderByCusId(@RequestParam String cusId) {
         TjCustomer tjCustomer = tjCustomerService.getById(cusId);
@@ -2417,10 +2530,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) {
@@ -2456,7 +2569,7 @@
                         return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
                     }
                 }
-                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
                 if (zfHisApiMethods) {
                     return AjaxResult.success("鎾ら攢鎴愬姛");
                 } else {
@@ -2471,14 +2584,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);
@@ -2504,10 +2617,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);
@@ -2541,8 +2654,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);
@@ -2584,11 +2697,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();
@@ -2597,12 +2710,14 @@
     }
 
 
-    @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();
+        LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TjOrder::getCardId,cardId);
+        TjOrder order = tjOrderService.getOne(queryWrapper);
         order.setCardId(cardId);
         String configByKey = configService.selectConfigByKey("sfkqdyhis");
         if (configByKey.equals("Y")) {
@@ -2622,7 +2737,7 @@
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮h�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
             } else {
-                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
                 if (zfHisApiMethods) {
                     return AjaxResult.success("鎾ら攢鎴愬姛", map);
                 } else {
@@ -2635,10 +2750,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) {
@@ -2656,10 +2771,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) {
@@ -2690,8 +2805,8 @@
     }
 
 
-    @PostMapping ("/revokeBlProByBldhAndTjh")
-    @ApiOperation (value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
+    @PostMapping("/revokeBlProByBldhAndTjh")
+    @ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
     @Transactional
     public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
 
@@ -2722,7 +2837,7 @@
 
                 }
                 boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
-                if(!b){
+                if (!b) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
                 }
@@ -2740,8 +2855,8 @@
     }
 
 
-    @PostMapping ("/addYaoPinShenQing")
-    @ApiOperation (value = "鑽搧淇℃伅鐢宠")
+    @PostMapping("/addYaoPinShenQing")
+    @ApiOperation(value = "鑽搧淇℃伅鐢宠")
     @Transactional
     public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto) {
         AjaxResult result = controller.Outpinmedicapply(dto);

--
Gitblit v1.8.0