From 73a816fd2b1e29c25d615c85ce34b12b55c16ccf Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 20 一月 2025 13:41:45 +0800
Subject: [PATCH] zjh20250120

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 1346 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 1,011 insertions(+), 335 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 80648ee..c5f281b 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
@@ -25,6 +25,7 @@
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.symmetric.DES;
 import cn.hutool.extra.pinyin.PinyinUtil;
 import cn.hutool.json.JSONArray;
@@ -52,6 +53,7 @@
 import com.ltkj.hosp.domain.*;
 import com.ltkj.hosp.dto.QianDaoDto;
 import com.ltkj.hosp.dto.TjProBlDto;
+import com.ltkj.hosp.dto.UpdateTransitionnewPriceDto;
 import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
 import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
 import com.ltkj.hosp.mapper.TestMapper;
@@ -77,9 +79,11 @@
 import com.ltkj.web.controller.lis.LisApiMethod;
 import com.ltkj.web.controller.pacs.PacsApiMethodService;
 import com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
+import com.ltkj.web.wxUtils.HttpClientUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.aspectj.weaver.ast.Var;
@@ -111,7 +115,7 @@
  */
 @RestController
 @RequestMapping("/hosp/order")
-@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛")
+@Api(tags = "PC绔� ----浣撴璁板綍鎺ュ彛 OrderController")
 @Slf4j
 public class TjOrderController extends BaseController {
     @Resource
@@ -226,6 +230,11 @@
     private LisJyflhbService lisJyflhbService;
     @Autowired
     private ISysDictDataService sysDictDataService;
+    @Autowired
+    private TjFlowingWaterHisService tjFlowingWaterHisService;
+    @Resource
+    private ITjXdPictureService xdPictureService;
+
     //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
     public JSONObject getJSONObject(String builder) {
         String Response = JSONUtil.parseObj(builder).getStr("Response");
@@ -408,73 +417,23 @@
     @ApiOperation(value = "鏌ヨ浣撴璁板綍鍒楄〃")
     public AjaxResult getOrderList(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
                                    @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+                                   @ApiParam(value = "鐘舵��") @RequestParam(required = false) Integer zt,
                                    @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
                                    @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
                                    @ApiParam(value = "椤圭洰鍚�)") @RequestParam(required = false) String xmmc,
                                    @ApiParam(value = "鐧昏寮�濮嬫椂闂�") @RequestParam(required = false) Date djbeginTime,
                                    @ApiParam(value = "鐧昏缁撴潫鏃堕棿") @RequestParam(required = false) Date djendTime,
                                    @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) Date bgbeginTime,
-                                   @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime) {
+                                   @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) Date bgendTime,
+                                   @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw) {
         Map<String, Object> map = new HashMap<>();
+        List<Long> cusIds = null;
         if (null != name) {
             LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
             wqq.like(TjCustomer::getCusName, name);
-            List<TjCustomer> customerList = tjCustomerService.list(wqq);
-            if (null != customerList && customerList.size() > 0) {
-                List<TjOrder> list = new ArrayList<>();
-                for (TjCustomer customer : customerList) {
-                    LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-                    if (null != djbeginTime && null != djendTime) {
-                        wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(djbeginTime), DateUtil.endOfDay(djendTime));
-                    }
-                    wq.eq(TjOrder::getUserId, customer.getCusId());
-                    list.addAll(tjOrderService.list(wq));
-                }
-                List<TjOrder> collect = null;
-                if (list.size() > 0) {
-                    for (TjOrder order : list) {
-                        TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
-                        if (null != tjCustomer) {
-//                            order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
-                            order.setTjCustomerName(tjCustomer.getCusName());
-//                            order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
-                            order.setTjCustomerPhone(tjCustomer.getCusPhone());
-//                            order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
-                            order.setTjCusIdCard(tjCustomer.getCusIdcard());
-                            order.setTjCustomerSex(tjCustomer.getCusSex());
-                            order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
-                            order.setCareer(tjCustomer.getCareer());
-                            order.setIdType(tjCustomer.getIdType());
-                            order.setAgeUnit(tjCustomer.getAgeUnit());
-                            order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
-                        }
-                        String firmId = order.getFirmId();
-                        if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
-                            order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName());
-                        }
-                        if (null != order.getPacId()) {
-                            if (null != tjPackageService.getById(order.getPacId())) {
-                                order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
-                            }
-                            if (null != dwDeptService.getById(order.getPacId())) {
-                                order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
-                            }
-                        }
-                        TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
-                        if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
-                    }
-                    collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-                }
-                if (null != collect) {
-                    map.put("total", collect.size());
-                } else {
-                    map.put("total", 0);
-                }
-                map.put("list", collect);
-                return AjaxResult.success(map);
-            }
-
+            cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
         }
+
         Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
         if (null != djbeginTime && null != djendTime) {
@@ -490,6 +449,104 @@
 
         if (null != xmmc) {
             wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc));
+        }
+
+        if (StrUtil.isNotBlank(dw)) {
+            wq.like(TjOrder::getFirmName, dw);
+        }
+
+        if (null != cusIds && !cusIds.isEmpty()) {
+            wq.in(TjOrder::getUserId, cusIds);
+        }
+
+        if (null != zt && (zt == 0 || zt == 1 || zt == 2)) {
+            List<TjOrder> orders = new ArrayList<>();
+            List<TjOrder> tjOrders = null;
+            List<TjOrder> orderList = tjOrderService.list(wq);
+            if (null != orderList && !orderList.isEmpty()) {
+                for (TjOrder order : orderList) {
+                    int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
+                    int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
+                    if (zt == 0 && czwj == 0) {
+                        //鏈0
+                        order.setZt("鏈");
+                        orders.add(order);
+                    }
+                    if (zt == 1 && czwj > 0) {
+                        //鍦ㄦ1
+                        order.setZt("鍦ㄦ");
+                        orders.add(order);
+                    }
+                    if (zt == 2 && sfwc == 0 && order.getCheckStatus() == 0 && order.getCheckTime() == null && order.getHeshouStatus() == 0 && order.getPrintLastTime() == null) {
+                        //宸插畬鎴�2
+                        order.setZt("宸插畬鎴�");
+                        orders.add(order);
+                    }
+                }
+                if (!orders.isEmpty()) {
+                    tjOrders = orders.stream().sorted(Comparator.comparing(TjOrder::getCreateTime).reversed())
+                            .skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+                    for (TjOrder order : tjOrders) {
+                        TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
+                        if (null != tjCustomer) {
+                            order.setTjCustomerSex(tjCustomer.getCusSex());
+                            order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
+                            order.setTjCustomerName(tjCustomer.getCusName());
+                            order.setTjCustomerPhone(tjCustomer.getCusPhone());
+                            order.setTjCusIdCard(tjCustomer.getCusIdcard());
+                            order.setCareer(tjCustomer.getCareer());
+                            order.setIdType(tjCustomer.getIdType());
+                            order.setAgeUnit(tjCustomer.getAgeUnit());
+                            order.setTjCount(String.valueOf(tjCustomer.getCusNumber()));
+                            String firmName = order.getFirmName();
+                            if (StringUtil.isNotBlank(firmName)) {
+                                order.setDictCompName(firmName);
+                            }
+                            if (null != order.getPacId()) {
+                                if (null != tjPackageService.getById(order.getPacId())) {
+                                    order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
+                                } else if (null != dwDeptService.getById(order.getPacId())) {
+                                    order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
+                                }
+                            }
+                            TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
+                            if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
+                        }
+                    }
+                }
+            }
+            map.put("list", tjOrders);
+            map.put("total", orders.size());
+            return AjaxResult.success(map);
+        }
+
+        if (null != zt) {
+            if (zt == 3) {
+                //宸插鏍�
+                wq.isNotNull(TjOrder::getCheckTime);
+                wq.eq(TjOrder::getCheckStatus, 1);
+                wq.isNull(TjOrder::getHeshouTime);
+                wq.isNull(TjOrder::getPrintLastTime);
+                wq.eq(TjOrder::getHeshouStatus, 0);
+            }
+            if (zt == 4) {
+                //鐢熸垚鎶ュ憡
+                wq.isNotNull(TjOrder::getReportTime);
+                wq.isNull(TjOrder::getHeshouTime);
+                wq.isNull(TjOrder::getPrintLastTime);
+                wq.eq(TjOrder::getHeshouStatus, 0);
+            }
+            if (zt == 5) {
+                //鎶ュ憡鏍告敹
+                wq.eq(TjOrder::getHeshouStatus, 1);
+                wq.isNull(TjOrder::getPrintLastTime);
+            }
+            if (zt == 6) {
+                //宸插嚭鎶ュ憡
+                wq.isNotNull(TjOrder::getPrintLastTime);
+                wq.eq(TjOrder::getHeshouStatus, 1);
+                wq.isNotNull(TjOrder::getPrintLastTime);
+            }
         }
 
         wq.orderByDesc(TjOrder::getCreateTime);
@@ -508,20 +565,74 @@
                     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()));
                 }
-                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());
+                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("宸插嚭鎶ュ憡");
                     }
                 }
-                TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
-                if(null !=dycs)order.setDycs(Math.toIntExact(dycs.getDycs()));
             }
         }
         map.put("list", list);
@@ -534,83 +645,39 @@
     @ApiOperation(value = "浣撴鎶ュ憡椤甸潰鈥斺�斾綋妫�璁板綍鍒楄〃")
     public AjaxResult getOrderListOO(@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
                                      @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+                                     @ApiParam(value = "鎵撳嵃鏈墦鍗扮姸鎬� 0鏈墦鍗� 1宸叉墦鍗�") @RequestParam(required = false) Integer dyzt,
                                      @ApiParam(value = "浣撴鍙�)") @RequestParam(required = false) String tjNum,
                                      @ApiParam(value = "濮撳悕)") @RequestParam(required = false) String name,
+                                     @ApiParam(value = "鍗曚綅") @RequestParam(required = false) String dw,
                                      @ApiParam(value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam(required = false) String djbeginTime,
                                      @ApiParam(value = "鎶ュ憡缁撴潫鏃堕棿") @RequestParam(required = false) String djendTime) {
-        Map<String, Object> map = new HashMap<>();
-        if (null != name) {
+                                    /*        Map<String, Object> map = new HashMap<>();
+        List<Long> cusIds = null;
+        if (StringUtil.isNotBlank(name)) {
             LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
             wqq.like(TjCustomer::getCusName, name);
-            List<TjCustomer> customerList = tjCustomerService.list(wqq);
-            if (null != customerList && !customerList.isEmpty()) {
-                List<TjOrder> list = new ArrayList<>();
-                for (TjCustomer customer : customerList) {
-                    LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-                    wq.isNotNull(TjOrder::getReportTime);
-                    wq.eq(TjOrder::getUserId, customer.getCusId());
-                    wq.eq(TjOrder::getHeshouStatus, 1); //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
-                    list.addAll(tjOrderService.list(wq));
-                }
-                List<TjOrder> collect = null;
-                if (!list.isEmpty()) {
-
-                    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(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
-                        list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
-
-                        String firmId = list.get(i).getFirmId();
-                        if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
-                            list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
-                        }
-                        if (null != list.get(i).getPacId()) {
-                            if (null != tjPackageService.getById(list.get(i).getPacId())) {
-                                list.get(i).setPacName(tjPackageService.getById(list.get(i).getPacId()).getPacName());
-                            }
-                            if (null != dwDeptService.getById(list.get(i).getPacId())) {
-                                list.get(i).setPacName(dwDeptService.getById(list.get(i).getPacId()).getDwDeptName());
-                            }
-                        }
-                        //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
-                        LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
-                        wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
-                        wqqq.orderByDesc(TjReportPrint::getPrintTime);
-                        wqqq.last("limit 1");
-                        TjReportPrint one = tjReportPrintService.getOne(wqqq);
-                        if (one != null) {
-                            list.get(i).setPrintLastTime(one.getPrintTime());
-                        }
-
-                    }
-                    collect = list.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-                }
-                if (null != collect) {
-                    map.put("total", collect.size());
-                } else {
-                    map.put("total", 0);
-                }
-                map.put("list", collect);
-                return AjaxResult.success(map);
-            }
-
+            cusIds = tjCustomerService.list(wqq).stream().map(TjCustomer::getCusId).collect(Collectors.toList());
         }
         Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
-        wq.isNotNull(TjOrder::getReportTime);
-        wq.eq(TjOrder::getHeshouStatus, 1);  //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
+        if (dyzt == 0) {
+            wq.isNull(TjOrder::getPrintLastTime);
+            wq.eq(TjOrder::getHeshouStatus, 1);  //鏍告敹鐘舵�佷负1鎵嶈兘鎵撳嵃
+        } else {
+            wq.isNotNull(TjOrder::getPrintLastTime);
+        }
+
         if (null != djbeginTime && null != djendTime) {
             wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(DateUtil.parseDate(djbeginTime)), DateUtil.endOfDay(DateUtil.parseDate(djendTime)));
         }
         if (null != tjNum) {
-            wq.eq(TjOrder::getTjNumber, tjNum);
+            wq.like(TjOrder::getTjNumber, tjNum);
+        }
+        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);
@@ -625,14 +692,18 @@
                 list.get(i).setTjCustomerSex(tjCustomer.getCusSex());
                 list.get(i).setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                 list.get(i).setTjCustomerName(tjCustomer.getCusName());
-                list.get(i).setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
+                list.get(i).setTjCustomerPhone(tjCustomer.getCusPhone());
                 if (tjCustomer.getCusIdcard() != null) {
-                    list.get(i).setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
+                    list.get(i).setTjCusIdCard(tjCustomer.getCusIdcard());
                 }
 
-                String firmId = list.get(i).getFirmId();
-                if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
-                    list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+                if (null != tjCustomer.getCompName()) {
+                    list.get(i).setDictCompName(tjCustomer.getCompName());
+                } else {
+                    String firmId = list.get(i).getFirmId();
+                    if (firmId != null && null != iDictCompService.getById(String.valueOf(list.get(i).getFirmId()))) {
+                        list.get(i).setDictCompName(iDictCompService.getById(String.valueOf(list.get(i).getFirmId())).getCnName());
+                    }
                 }
                 if (null != list.get(i).getPacId()) {
                     if (null != tjPackageService.getById(list.get(i).getPacId())) {
@@ -643,18 +714,22 @@
                     }
                 }
                 //浠庢墦鍗拌褰曟煡鍑烘渶鏂版墦鍗版椂闂�
-                LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
-                wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
-                wqqq.orderByDesc(TjReportPrint::getPrintTime);
-                wqqq.last("limit 1");
-                TjReportPrint one = tjReportPrintService.getOne(wqqq);
-                if (one != null) {
-                    list.get(i).setPrintLastTime(one.getPrintTime());
-                }
+//                LambdaQueryWrapper<TjReportPrint> wqqq = new LambdaQueryWrapper<>();
+//                wqqq.eq(TjReportPrint::getTjNumber, list.get(i).getTjNumber());
+//                wqqq.orderByDesc(TjReportPrint::getPrintTime);
+//                wqqq.last("limit 1");
+//                TjReportPrint one = tjReportPrintService.getOne(wqqq);
+//                if (one != null) {
+//                    list.get(i).setPrintLastTime(one.getPrintTime());
+//                }
             }
         }
         map.put("list", list);
-        map.put("total", page2.getTotal());
+        map.put("total", page2.getTotal());*/
+
+        if (djbeginTime == null) djbeginTime = "";
+        if (djendTime == null) djendTime = "";
+        Map<String, Object> map = tjOrderService.getTjBgdyList(pageNum, pageSize, dyzt, tjNum, name, dw, djbeginTime, djendTime);
         return AjaxResult.success(map);
     }
 
@@ -943,6 +1018,7 @@
             }
             if (null != tjReservation.getTeamNo()) tjOrder.setTeamNo(tjReservation.getTeamNo());
             if (null != tjReservation.getCompanyId()) tjOrder.setFirmId(tjReservation.getCompanyId());
+            if (null != tjReservation.getCompany()) tjOrder.setFirmName(tjReservation.getCompany());
             if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
             if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
             if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
@@ -951,7 +1027,6 @@
                 tjOrder.setGroupId(tjReservation.getGroupingId());
                 tjOrder.setFirmDeptId(tjReservation.getPacId());
             }
-            //            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
             tjReservation.setIsExpire(1);
             tjReservationService.updateById(tjReservation);
             if (null != tjReservation.getTeamNo() && tjOrder.getTjType().equals("1")) {
@@ -959,6 +1034,9 @@
             } else if (tjOrder.getTjType().equals("2")) {
                 tjOrder.setTjType("2");
             }
+        }
+        if(StringUtil.isBlank(tjOrder.getFirmId())){
+            tjOrder.setFirmId("0");
         }
 
         if (null != tjOrder.getPhoto()) {
@@ -973,9 +1051,8 @@
                 tjOrder.setPhoto(encode);
             }
         }
-        if (tjOrder.getFirmId() == null) {
-            tjOrder.setFirmId("0");
-        }
+
+
         if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
             tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
         }
@@ -1008,11 +1085,21 @@
 
     @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
     public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {
-        //鐢熸垚浣撴鍙�
-        String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
-        tjOrder.setTjNumber(tjNumber);
-        BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
 
+        //鑾峰彇鎷兼帴鍓嶇紑
+        String makeLisTmhPrefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+
+        //鐢熸垚浣撴鍙�
+//        String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
+//        if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
+
+
+        String tjNumber = (SecurityUtils.getUsername()+IdUtils.getTjNumber());
+        if(StringUtil.isNotBlank(makeLisTmhPrefix)) tjNumber=makeLisTmhPrefix+tjNumber;
+        tjOrder.setTjNumber(tjNumber);
+
+
+        BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
         tjOrder.setDiscount(discount.toString());
         if (tjOrderService.save(tjOrder)) {
             //淇濆瓨鏀惰揣鍦板潃
@@ -1047,11 +1134,18 @@
             Date date1 = new Date(System.currentTimeMillis());
             String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
             tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "").toUpperCase() + s1);
+            BigDecimal copeWith = tjOrder.getTjFlowingWater().getCopeWith();
+            BigDecimal paidIn = tjOrder.getTjFlowingWater().getPaidIn();
 
+            tjFlowingWater.setCopeWith(copeWith);
+            tjFlowingWater.setPaidIn(paidIn);
+            tjFlowingWater.setDiscount(discount.toString());
 
-            tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
-            tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
-            tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
+            BigDecimal subtract = paidIn.subtract(copeWith.multiply(discount.divide(BigDecimal.valueOf(10))));
+            log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 搴斾粯: "+copeWith);
+            log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 鎶樻墸: "+discount);
+            log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 瀹炰粯: "+paidIn);
+            log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+" 鐩稿樊: "+subtract);
 
             if (isPay.equals("true")) {
                 if (null != mallOrder) {
@@ -1081,13 +1175,27 @@
                     //                    tjFlowingWater.setPayStasus(0L);
                 }
             }
+
+            //淇敼姣忛」鐨勫師浠风幇浠�
+//            transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+            //淇敼涓存椂琛ㄤ綋妫�鍙�
+            transitionService.updateTbTransitionTjNumByCusId(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
+            //琛ュ樊浠�
+    /*        if(subtract.compareTo(BigDecimal.ZERO)>0){
+                tjFlowingWater.setPaidIn(paidIn.add(subtract));
+                TbTransition onwTbTransition = transitionService.getOnwTbTransition(tjCustomer.getCusIdcard(),tjOrder.getTjNumber());
+                if(null !=onwTbTransition){
+                    log.info("绛惧埌鐧昏浣撴浜�: "+tjOrder.getTjNumber()+"缁�: "+onwTbTransition.getParentProName()+" "+onwTbTransition.getNowPrice()
+                            +" 琛ュ樊浠� "+subtract+" 鏈�缁堝緱 "+onwTbTransition.getNowPrice().add(subtract));
+                    onwTbTransition.setNowPrice(onwTbTransition.getNowPrice().add(subtract));
+                    transitionService.updateById(onwTbTransition);
+                }
+            }*/
+
             if (tjFlowingWaterService.save(tjFlowingWater)) {
                 tjOrder.setTjSerialNumber(String.valueOf(tjFlowingWater.getTjSerialNumber()));
                 tjOrderService.updateById(tjOrder);
             }
-
-            //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
-            transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
 
             /*璋冪敤his鎺ュ彛*/
             String config = configService.selectConfigByKey("sfkqdyhis");
@@ -1105,15 +1213,15 @@
 
                 log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: " + tjOrder.getCardId());
                 //鍥綋
-                if ("1".equals(tjOrder.getTjType())) {
+/*                if ("1".equals(tjOrder.getTjType())) {
 //                            asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
                     ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
-                }
+                }*/
                 //涓汉
-                if ("2".equals(tjOrder.getTjType())) {
+         /*       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)) {
                     // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
@@ -1123,10 +1231,18 @@
                     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);
                 } else {
+                    newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+                    List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+                    addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+
                     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());
@@ -1137,39 +1253,193 @@
             }
 
             //鍥綋
-            if ("1".equals(tjOrder.getTjType())) {
-//                        asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
-                asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
-            }
+//            if ("1".equals(tjOrder.getTjType())) {
+//                ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+////                asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+//                List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+//                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+//                return AjaxResult.success(tjNumber);
+//            }
             //涓汉
-            if ("2".equals(tjOrder.getTjType())) {
-                //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
-                newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
-                List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
-                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser,null);
-            }
+//            if ("2".equals(tjOrder.getTjType())) {
+//                //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+//                newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+//                List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+//                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+//
+//                String s = configService.selectConfigByKey("is_request_common_his_api");
+//                if (null != s && s.equals("Y")) {
+//                    String apiUrl = configService.selectConfigByKey("common_api_url");
+//                    String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+//                    HashMap<String, Object> map = new HashMap<>();
+//                    map.put("pationId", tjCustomer.getPationId());
+//                    map.put("cardId", tjCustomer.getHisJzkh());
+//                    map.put("tjNum", tjFlowingWater.getTjSerialNumber());
+//                    map.put("kaiDanKs", "7805");
+//                    // 鏀惰垂鏍囧織 1寰呭敭璐� 2寰呴��璐�
+//                    map.put("shouTuiStatus", "1");
+//
+//                    JSONArray array = JSONUtil.createArray();
+//                    LambdaQueryWrapper<TbTransition> wrapper = new LambdaQueryWrapper<>();
+//                    wrapper.eq(TbTransition::getTjNum, tjOrder.getTjNumber());
+//                    wrapper.eq(TbTransition::getCusId, tjCustomer.getCusIdcard());
+//                    wrapper.eq(TbTransition::getCardId, tjCustomer.getCardId());
+//                    wrapper.isNotNull(TbTransition::getOrdPrice);
+//                    wrapper.gt(TbTransition::getOrdPrice, 0);
+//
+//                    List<TbTransition> list = tbTransitionService.list(wrapper);
+//                    for (TbTransition transition : list) {
+//                        LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
+//                        wrapper1.eq(TjProject::getProId, transition.getProId());
+//                        TjProject project = projectService.getOne(wrapper1);
+//
+//                        LambdaQueryWrapper<SysDept> wrapper2 = new LambdaQueryWrapper<>();
+//                        wrapper2.eq(SysDept::getDeptId, project.getDeptId());
+//                        SysDept dept = sysDeptService.getOne(wrapper2);
+//
+//                        JSONObject obj = JSONUtil.createObj();
+//                        Integer sl = project.getSl();
+//                        BigDecimal danjia = transition.getOrdPrice();
+//                        BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
+//                        obj.putOpt("danJia", danjia);
+//                        obj.putOpt("jieSuanJe", allPrice);
+//                        obj.putOpt("shuliang", sl);
+//                        obj.putOpt("zhiXingKs", dept.getDeptId());
+//                        obj.putOpt("zhiXingKsMc", dept.getDeptName());
+//                        obj.putOpt("shouFeiXmId", project.getHisXmbm());
+//                        obj.putOpt("shouFeiXmMc", project.getHisXmmc());
+//
+////                        obj.putOpt("zhiXingKs","7805");
+////                        obj.putOpt("zhiXingKsMc","浣撴绉�");
+////                        obj.putOpt("shouFeiXmId","4735346");
+////                        obj.putOpt("shouFeiXmMc","浣撴璐�");
+//                        array.add(obj);
+//                    }
+//                    map.put("feiYongInfoList", array);
+//
+//                    String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
+//                    JSONObject object = JSONUtil.parseObj(post);
+//                    if (object.getInt("code") == 200) {
+//                        JSONObject data = object.getJSONObject("data");
+//                        tjFlowingWater.setHisWaterId(data.getStr("feiYongId"));
+//                        JSONArray mxList = data.getJSONArray("mxList");
+//                        if (mxList != null && !mxList.isEmpty()) {
+//                            List<TjFlowingWaterHis> his = mxList.toList(TjFlowingWaterHis.class);
+//                            tjFlowingWaterHisService.saveBatch(his);
+//                        }
+//                        tjFlowingWaterService.updateById(tjFlowingWater);
+//                    } else {
+//                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//                        return AjaxResult.error();
+//                    }
+//                }
+//                return AjaxResult.success(tjNumber);
+//            }
+
             // 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
+
             if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
                 // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
                 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);
-
+                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
+                return AjaxResult.success(tjNumber);
+            }else {
+                newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+                AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
+                if (error != null) return error;
+//                List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
+//                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
             }
-//            pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
+
             return AjaxResult.success(tjNumber);
+//            pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
+//            return AjaxResult.success(tjNumber);
         }
         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         return AjaxResult.error();
     }
 
-    public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
+    private AjaxResult isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
+        String s = configService.selectConfigByKey("is_request_common_his_api");
+        if (null != s && s.equals("Y")) {
+            String apiUrl = configService.selectConfigByKey("common_api_url");
+            String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("pationId", tjCustomer.getPationId());
+            map.put("cardId", tjCustomer.getHisJzkh());
+            map.put("tjNum", tjFlowingWater.getTjSerialNumber());
+            map.put("kaiDanKs", "7805");
+            // 鏀惰垂鏍囧織 1寰呭敭璐� 2寰呴��璐�
+            map.put("shouTuiStatus", "1");
+
+            JSONArray array = JSONUtil.createArray();
+            LambdaQueryWrapper<TbTransition> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(TbTransition::getTjNum, tjOrder.getTjNumber());
+            wrapper.eq(TbTransition::getCusId, tjCustomer.getCusIdcard());
+            wrapper.eq(TbTransition::getCardId, tjCustomer.getCardId());
+            wrapper.isNotNull(TbTransition::getOrdPrice);
+            wrapper.gt(TbTransition::getOrdPrice, 0);
+
+            List<TbTransition> list = tbTransitionService.list(wrapper);
+            for (TbTransition transition : list) {
+                LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(TjProject::getProId, transition.getProId());
+                TjProject project = projectService.getOne(wrapper1);
+
+                LambdaQueryWrapper<SysDept> wrapper2 = new LambdaQueryWrapper<>();
+                wrapper2.eq(SysDept::getDeptId, project.getDeptId());
+                SysDept dept = sysDeptService.getOne(wrapper2);
+
+                JSONObject obj = JSONUtil.createObj();
+                Integer sl = project.getSl();
+                BigDecimal danjia = transition.getOrdPrice();
+                BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
+                obj.putOpt("danJia", danjia);
+                obj.putOpt("jieSuanJe", allPrice);
+                obj.putOpt("shuliang", sl);
+                obj.putOpt("zhiXingKs", dept.getDeptId());
+                obj.putOpt("zhiXingKsMc", dept.getDeptName());
+                obj.putOpt("shouFeiXmId", project.getHisXmbm());
+                obj.putOpt("shouFeiXmMc", project.getHisXmmc());
+
+//                        obj.putOpt("zhiXingKs","7805");
+//                        obj.putOpt("zhiXingKsMc","浣撴绉�");
+//                        obj.putOpt("shouFeiXmId","4735346");
+//                        obj.putOpt("shouFeiXmMc","浣撴璐�");
+                array.add(obj);
+            }
+            map.put("feiYongInfoList", array);
+
+            String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
+            JSONObject object = JSONUtil.parseObj(post);
+            if (object.getInt("code") == 200) {
+                JSONObject data = object.getJSONObject("data");
+                tjFlowingWater.setHisWaterId(data.getStr("feiYongId"));
+                JSONArray mxList = data.getJSONArray("mxList");
+                if (mxList != null && !mxList.isEmpty()) {
+                    List<TjFlowingWaterHis> his = mxList.toList(TjFlowingWaterHis.class);
+                    tjFlowingWaterHisService.saveBatch(his);
+                }
+                tjFlowingWaterService.updateById(tjFlowingWater);
+            } else {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error();
+            }
+        }
+        return null;
+    }
+
+    public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
+        String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
+        String config = configService.selectConfigByKey("sfkqdyhis");
+        Boolean lisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
         if (null != detailList && detailList1) {
             Date date = new Date();
             String format = DateUtil.format(date, "yyMMddHHmmssSSS");
@@ -1180,17 +1450,21 @@
                 Long proParentId = project.getProParentId();
                 String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType());
                 if (null != proParentId && proParentId == 0) {
-                    sampling.setJyxh(idUtils.generateLisID());
-                        sampling.setSpecimenTypeCode(project.getSpecimenType());
-                        sampling.setSpecimenType(dictLabel);
-                        sampling.setJyxmdm(project.getProId().toString());
+                    sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
+                    sampling.setSpecimenTypeCode(project.getSpecimenType());
+                    sampling.setSpecimenType(dictLabel);
+                    if (config.equals("Y") && lisAndPacsRegister)
+                        sampling.setJyxmdm(project.getLisXmbm());
+                    else sampling.setJyxmdm(project.getProId().toString());
                 } else {
                     TjProject project1 = projectService.getById(proParentId);
-                    sampling.setJyxh(idUtils.generateLisID());
+                    sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
 
-                        sampling.setSpecimenTypeCode(project1.getSpecimenType());
-                        sampling.setSpecimenType(dictLabel);
-                        sampling.setJyxmdm(project.getProId().toString());
+                    sampling.setSpecimenTypeCode(project1.getSpecimenType());
+                    sampling.setSpecimenType(dictLabel);
+                    if (config.equals("Y") && lisAndPacsRegister)
+                        sampling.setJyxmdm(project1.getLisXmbm());
+                    else sampling.setJyxmdm(project1.getProId().toString());
 
                 }
                 sampling.setSamplingNumber(format);
@@ -1213,10 +1487,9 @@
                 samplingService.save(sampling);
             }
         }
-        String config = configService.selectConfigByKey("sfkqdyhis");
-        if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
+        if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
             AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
-            if (ajaxResult.get("code").toString().equals("200")){
+            if (ajaxResult.get("code").toString().equals("200")) {
                 String str = ajaxResult.get("data").toString();
                 str = str.replace("=", ":");
                 JSONArray array = JSONUtil.parseArray(str);
@@ -1228,12 +1501,12 @@
                     lisJyflhb.setMc(object.getStr("mc"));
                     lisJyflhb.setFlbm(object.getStr("flbm"));
                     LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
+                    wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
                     LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
                     if (jyflhb == null) {
                         lisJyflhb.setId(IdUtil.getSnowflake().nextId());
                         lisJyflhbService.save(lisJyflhb);
-                    }else {
+                    } else {
                         lisJyflhb.setId(jyflhb.getId());
                         lisJyflhbService.updateById(lisJyflhb);
                     }
@@ -1241,8 +1514,12 @@
             }
 
         }
+        if (StrUtil.isNotBlank(jxbz)){
+            tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz);
+        }else {
+            tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+        }
     }
-
 
 
     @PostMapping("/addPlOrderAndDetail")
@@ -1718,10 +1995,10 @@
                 transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
                 List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
                 if (null != ppList && !ppList.isEmpty()) {
-                    String string = transitionService.panduantaocanshifouchongfu(cusId,pacId);
-                    if(!StringUtils.isBlank(string)){
+                    String string = transitionService.panduantaocanshifouchongfu(cusId, pacId);
+                    if (!StringUtils.isBlank(string)) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: "+string);
+                        return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
                     }
                     transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
                 }
@@ -2035,11 +2312,7 @@
     private List<Map<String, Object>> getMaps(String cusId, String cardId) {
 
         List<TbTransition> transitionList = null;
-//        if (redisCache.hasKey(cardId + cusId)) {
-//            transitionList = redisCache.getCacheList(cardId + cusId);
-//        } else {
         transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
-//        }
         if (null == transitionList) return null;
         Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
         List<Map<String, Object>> list = new ArrayList<>();
@@ -2049,23 +2322,26 @@
             map.put("proPrantId", entry.getKey().toString());
             if (null != pacId) {
                 TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
-                map.put("tjCategory", aPackage.getTjCategory());
-                map.put("pacName", aPackage.getPacName());
-                TjProject tjProject = projectService.getById(entry.getKey());
-//                TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
-//                        .eq(TjPackageProject::getProId, entry.getKey()));
-                map.put("ordPrice", tjProject.getProPrice());
-//                if (null != project) {
-//                    map.put("nowPrice", project.getPriceNow());
-//                } else {
-//                    map.put("nowPrice", tjProject.getProPrice());
-//                }
-                map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+                if (null != aPackage) {
+                    map.put("tjCategory", aPackage.getTjCategory());
+                    map.put("pacName", aPackage.getPacName());
+                    TjProject tjProject = projectService.getById(entry.getKey());
+                    map.put("ordPrice", tjProject.getProPrice());
+                    map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+                } else {
+                    TjDwGrouping grouping = dwGroupingService.getById(pacId);
+                    map.put("tjCategory", null);
+                    map.put("pacName", grouping.getGroupingName());
+                    TjProject tjProject = projectService.getById(entry.getKey());
+                    map.put("ordPrice", tjProject.getProPrice());
+                    map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
+                }
+
             } else {
                 map.put("tjCategory", null);
                 map.put("pacName", "鍗曢」");
                 List<TbTransition> tbTransitionList = entry.getValue();
-                if (null != tbTransitionList && tbTransitionList.size() > 0) {
+                if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
                     BigDecimal money1 = new BigDecimal("0.00");
                     BigDecimal money2 = new BigDecimal("0.00");
                     for (TbTransition tbTransition : tbTransitionList) {
@@ -2354,9 +2630,9 @@
     @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")
+        wrapper.select("parent_pro_id", "parent_pro_name", "sum(now_price) as ord_price")
                 .eq("tj_num", tjNumber)
-                .groupBy("parent_pro_name");
+                .groupBy("parent_pro_id");
         List<TbTransition> list = transitionService.list(wrapper);
         List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList());
         LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>();
@@ -2434,6 +2710,9 @@
             if (null != tjReservation && tjReservation.getPayType() == 1) {
                 tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                         sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+                remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
+                List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
+                xdPictureService.saveBatch(xdPictureList);
             }
         }
         if (tjFlowingWater.getPayStasus() == 1L) {
@@ -2443,7 +2722,10 @@
             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);
         }
     }
 
@@ -2453,49 +2735,49 @@
         tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
         boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
                 String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
-        if (!b) {
-            List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
-            if (null != proList && !proList.isEmpty()) {
-                for (TjGroupingPro groupingPro : proList) {
-                    TjOrderDetail detail = new TjOrderDetail();
-                    TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId()));
-                    detail.setIsSampling(String.valueOf(tjProject.getIsSampling()));
-                    detail.setOrderId(tjOrder.getOrderId());
-                    detail.setProId(Long.valueOf(groupingPro.getProId()));
-                    detail.setTjStatus(0L);
-                    detail.setCreateBy(sysUser.getNickName());
-                    detail.setCreateTime(new Date());
-                    detail.setUpdateBy(sysUser.getNickName());
-                    detail.setUpdateTime(new Date());
-                    detail.setCreateId(String.valueOf(sysUser.getUserId()));
-                    detail.setUpdateId(String.valueOf(sysUser.getUserId()));
-                    tjOrderDetailService.save(detail);
-                }
-                List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
-                List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list));
-                for (TjProject project : projectList) {
-                    TjOrderDetail detail = new TjOrderDetail();
-                    detail.setOrderId(tjOrder.getOrderId());
-                    detail.setProId(project.getProId());
-                    detail.setTjStatus(0L);
-                    detail.setCreateBy(sysUser.getNickName());
-                    detail.setCreateTime(new Date());
-                    detail.setUpdateBy(sysUser.getNickName());
-                    detail.setUpdateTime(new Date());
-                    detail.setCreateId(String.valueOf(sysUser.getUserId()));
-                    detail.setUpdateId(String.valueOf(sysUser.getUserId()));
-                    //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉
-                    if (null != project.getProDefault()) {
-                        detail.setProResult(project.getProDefault());
-                    } else {
-                        detail.setProResult(null);
-                    }
-                    detail.setIsSampling(String.valueOf(project.getIsSampling()));
-
-                    tjOrderDetailService.save(detail);
-                }
-            }
-        }
+//        if (!b) {
+//            List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
+//            if (null != proList && !proList.isEmpty()) {
+//                for (TjGroupingPro groupingPro : proList) {
+//                    TjOrderDetail detail = new TjOrderDetail();
+//                    TjProject tjProject = projectService.selectTjProjectByProId(Long.valueOf(groupingPro.getProId()));
+//                    detail.setIsSampling(String.valueOf(tjProject.getIsSampling()));
+//                    detail.setOrderId(tjOrder.getOrderId());
+//                    detail.setProId(Long.valueOf(groupingPro.getProId()));
+//                    detail.setTjStatus(0L);
+//                    detail.setCreateBy(sysUser.getNickName());
+//                    detail.setCreateTime(new Date());
+//                    detail.setUpdateBy(sysUser.getNickName());
+//                    detail.setUpdateTime(new Date());
+//                    detail.setCreateId(String.valueOf(sysUser.getUserId()));
+//                    detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+//                    tjOrderDetailService.save(detail);
+//                }
+//                List<String> list = proList.stream().map(TjGroupingPro::getProId).collect(Collectors.toList());
+//                List<TjProject> projectList = projectService.list(new LambdaQueryWrapper<TjProject>().in(TjProject::getProParentId, list));
+//                for (TjProject project : projectList) {
+//                    TjOrderDetail detail = new TjOrderDetail();
+//                    detail.setOrderId(tjOrder.getOrderId());
+//                    detail.setProId(project.getProId());
+//                    detail.setTjStatus(0L);
+//                    detail.setCreateBy(sysUser.getNickName());
+//                    detail.setCreateTime(new Date());
+//                    detail.setUpdateBy(sysUser.getNickName());
+//                    detail.setUpdateTime(new Date());
+//                    detail.setCreateId(String.valueOf(sysUser.getUserId()));
+//                    detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+//                    //鑾峰彇璇ラ」鐩殑榛樿鍊艰祴鍊肩粰缁撴灉
+//                    if (null != project.getProDefault()) {
+//                        detail.setProResult(project.getProDefault());
+//                    } else {
+//                        detail.setProResult(null);
+//                    }
+//                    detail.setIsSampling(String.valueOf(project.getIsSampling()));
+//
+//                    tjOrderDetailService.save(detail);
+//                }
+//            }
+//        }
 
         //娣诲姞remark琛ㄦ暟鎹�
         remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
@@ -2505,11 +2787,13 @@
             if (null != tjReservation && tjReservation.getPayType() == 1) {
                 tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                         sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+                remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
             }
         }
         if (tjFlowingWater.getPayStasus() == 1) {
             tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                     sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
+            remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
         }
         if (tjFlowingWater.getDiscount() == null) {
             transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
@@ -2553,16 +2837,18 @@
 //        }
     }
 
-    @PostMapping("/heXiaoByIds/{orderIds}")
+    @PostMapping("/heXiaoByIds")
     @ApiOperation(value = "鏍告敹鎶ュ憡鈥斺�斺�斺�斺�斺�旀�绘瀹℃牳閫氳繃鍚庡彲浠ユ牳閿�锛屾牳鏀跺悗鎵嶈兘鎵撳嵃")
     @Transactional
     @RepeatSubmit
-    public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
-        Date date = new Date();
-        for (String orderId : orderIds) {
-            TjOrder byId = tjOrderService.getById(orderId);
-            if (null != byId) {
-                if (byId.getReportTime() == null) {
+    public AjaxResult heXiaoByIds(@RequestBody List<String> orderIds) {
+        if (null != orderIds && !orderIds.isEmpty()) {
+            Date date = new Date();
+            for (String orderId : orderIds) {
+                TjOrder byId = tjOrderService.getById(orderId);
+                if (null != byId) {
+
+                /*if (byId.getReportTime() == null) {
                     LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();
                     tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);
                     tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);
@@ -2577,34 +2863,20 @@
                         //淇敼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);
+                    LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(TjReportTemplate::getFlag, "4");
+                    wrapper.eq(TjReportTemplate::getOpen, "1");
+                    TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
                     try {
-                        shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate);
+                        shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);
                         byId.setStatus(TjConstants.TJ_END);
-                        byId.setReportTime(date);
-                        byId.setPrintLastTime(date);
-                        byId.setDownloadLastTime(date);
                     } catch (Exception e) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         e.printStackTrace();
@@ -2612,14 +2884,14 @@
                         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("鏍告敹澶辫触");
+                }*/
+                    byId.setHeshouStatus(1);
+                    byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
+                    byId.setHeshouTime(date);
+                    final boolean b = tjOrderService.updateById(byId);
+                    if (!b) {
+                        return AjaxResult.error("鏍告敹澶辫触");
+                    }
                 }
             }
         }
@@ -2627,9 +2899,9 @@
     }
 
 
-    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
-//        AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
-        AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);
+    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
+
+        AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate, zongJianYiShiQianMing);
         if (!ajaxResult.get("code").toString().equals("200")) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         } else {
@@ -2644,12 +2916,6 @@
             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;
     }
@@ -2781,18 +3047,54 @@
 //            if (null != payByTjNum) {
 //                return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
 //            }
-            if(null !=order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
-            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
-            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
-            remarkService.deletedOrderRemarkByTjNum(tjNum);
-            tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
-            transitionService.deletedTbTransitionByTjNum(tjNum);
+            if (null != order.getFinishTime()) return AjaxResult.error("璇ヤ汉鍛樺凡绛剧,涓嶅彲鎾ら攢!!!");
 
-            TjCustomer customer = tjCustomerService.getById(order.getUserId());
-            customer.setCardId("0");
-            tjCustomerService.updateById(customer);
+            Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+
+            String s = configService.selectConfigByKey("is_request_common_his_api");
+//            if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+            if (null != s && s.equals("Y") && !useLisAndPacsRegister) {
+                String apiUrl = configService.selectConfigByKey("common_api_url");
+                String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+
+                ArrayList<TjFlowingWater> weizhifu = new ArrayList<>();
+                ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
+                LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
+                wrapper1.eq(TjFlowingWater::getOrderId, order.getOrderId());
+                wrapper1.orderByDesc(TjFlowingWater::getJxbz);
+                List<TjFlowingWater> list = tjFlowingWaterService.list(wrapper1);
+                LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(TjCustomer::getCusId, order.getUserId());
+                TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
+
+                for (TjFlowingWater water : list) {
+                    if (water.getPayStasus() == 0L) {
+                        weizhifu.add(water);
+                    } else {
+                        yizhifu.add(water);
+                    }
+                }
+
+                AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, tjNum);
+                if (error != null && !error.get("code").toString().equals("200")) return error;
+
+                AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, tjNum);
+                if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+            } else {
+                tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+                tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+                remarkService.deletedOrderRemarkByTjNum(tjNum);
+                tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+                transitionService.deletedTbTransitionByTjNum(tjNum);
+
+                TjCustomer customer = tjCustomerService.getById(order.getUserId());
+                customer.setCardId("0");
+                tjCustomerService.updateById(customer);
+                xdPictureService.deleteTjXdPictureBytjNum(tjNum);
+                tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
+            }
+
             String configByKey = configService.selectConfigByKey("sfkqdyhis");
-            tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId());
             if (configByKey.equals("Y")) {
 
                 HashMap<String, Object> hisRequestParams = new HashMap<>();
@@ -2841,11 +3143,11 @@
         if (null != reservationTime)
             wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime), DateUtil.endOfDay(reservationTime));
         List<TjReservation> reservationList = tjReservationService.list(wq);
-        if (null != reservationList && reservationList.size() > 0) {
+        if (null != reservationList && !reservationList.isEmpty()) {
             LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
             wq1.in(TjOrder::getReservationId, reservationList.stream().map(TjReservation::getId).collect(Collectors.toList()));
             List<TjOrder> orderList = tjOrderService.list(wq1);
-            if (null != orderList && orderList.size() > 0) {
+            if (null != orderList && !orderList.isEmpty()) {
                 LambdaQueryWrapper<TjReservation> wq3 = new LambdaQueryWrapper<>();
                 wq3.in(TjReservation::getId, orderList.stream().map(TjOrder::getReservationId).collect(Collectors.toList()));
 //                    wq3.eq(TjReservation::getTeamNo,reservationList.get(0).getTeamNo());
@@ -2862,11 +3164,11 @@
     @ApiOperation(value = "鏍规嵁瀹㈡埛浣撴鍙锋壒閲忔挙閿�浣撴璁板綍")
     @Transactional
     public AjaxResult plRevokeTjOrderByTjNum(@RequestBody @ApiParam(value = "棰勭害涓婚敭id闆嗗悎") List<String> reservationIds) {
-        if (null != reservationIds && reservationIds.size() > 0) {
+        if (null != reservationIds && !reservationIds.isEmpty()) {
             LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
             wq1.in(TjOrder::getReservationId, reservationIds);
             List<TjOrder> orderList = tjOrderService.list(wq1);
-            if (null != orderList && orderList.size() > 0) {
+            if (null != orderList && !orderList.isEmpty()) {
                 for (TjOrder order : orderList) {
 //                TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
                     if (null != order) {
@@ -2879,7 +3181,7 @@
                         remarkService.deletedOrderRemarkByTjNum(order.getTjNumber());
                         tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
                         transitionService.deletedTbTransitionByTjNum(order.getTjNumber());
-                        transitionService.updateTbTransitionByTjNum(order.getTjNumber());
+//                        transitionService.updateTbTransitionByTjNum(order.getTjNumber());
                     }
                 }
                 for (String id : reservationIds) {
@@ -2992,7 +3294,7 @@
 
 
     @GetMapping("/revokeTjOrderByTjh")
-    @ApiOperation(value = "鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
+    @ApiOperation(value = "寮哄埗鎾ら攢鎺ュ彛鏍规嵁灏变綋妫�鍙峰垹闄よ褰�")
     @Transactional
     public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNum) {
 
@@ -3002,11 +3304,13 @@
 //            if (null != payByTjNum) {
 //                return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
 //            }
+            //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
             tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
             tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
             remarkService.deletedOrderRemarkByTjNum(tjNum);
             tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
             transitionService.deletedTbTransitionByTjNum(tjNum);
+            tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
         }
         return AjaxResult.success();
     }
@@ -3022,12 +3326,12 @@
             LambdaQueryWrapper<TjProBl> wq = new LambdaQueryWrapper<>();
             wq.eq(TjProBl::getTjh, tjNum);
             List<TjProBl> blList = blService.list(wq);
-            if (null != blList && blList.size() > 0) {
+            if (null != blList && !blList.isEmpty()) {
                 for (TjProBl bl : blList) {
                     LambdaQueryWrapper<TjOrderRemark> wqr = new LambdaQueryWrapper<>();
                     wqr.eq(TjOrderRemark::getJxbz, bl.getBldh());
                     List<TjOrderRemark> remarkList = remarkService.list(wqr);
-                    if (null != remarkList && remarkList.size() > 0) {
+                    if (null != remarkList && !remarkList.isEmpty()) {
                         List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
                         LambdaQueryWrapper<TjProject> wqp = new LambdaQueryWrapper<>();
                         wqp.in(TjProject::getProId, collect);
@@ -3051,7 +3355,7 @@
 //    @Transactional
     public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
 
-        if (null == dto.getBldhs() || dto.getBldhs().size() == 0) {
+        if (null == dto.getBldhs() || dto.getBldhs().isEmpty()) {
             log.info("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
             return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
         }
@@ -3097,15 +3401,169 @@
                     return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
                 }
             }
-            try {
-                extracted(dto, order);
-            } catch (Exception e) {
-                log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
-                return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
+            String s = configService.selectConfigByKey("is_request_common_his_api");
+            Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
+//            if (null != s && s.equals("Y") && "2".equals(order.getTjType())) {
+            if (null != s && s.equals("Y") && !useLisAndPacsRegister) {
+                ArrayList<TjFlowingWater> weizhifu = new ArrayList<>();
+                ArrayList<TjFlowingWater> yizhifu = new ArrayList<>();
+                for (String bldh : dto.getBldhs()) {
+                    LambdaQueryWrapper<TjFlowingWater> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(TjFlowingWater::getJxbz, bldh);
+                    TjFlowingWater water = tjFlowingWaterService.getOne(wrapper);
+                    if (water.getPayStasus() == 0L) {
+                        weizhifu.add(water);
+                    } else {
+                        yizhifu.add(water);
+                    }
+                }
+                String apiUrl = configService.selectConfigByKey("common_api_url");
+                String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
+                LambdaQueryWrapper<TjCustomer> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(TjCustomer::getCusId, order.getUserId());
+                TjCustomer tjCustomer = tjCustomerService.getOne(wrapper);
+                AjaxResult error = zuofeiWeiZhifu(weizhifu, tjCustomer, apiUrl, hospbm, order, true, dto.getTjh());
+                if (error != null && !error.get("code").toString().equals("200")) return error;
+
+                AjaxResult error1 = zuofeiYiZhifu(yizhifu, tjCustomer, order, apiUrl, hospbm, false, dto.getTjh());
+                if (error1 != null && !error.get("code").toString().equals("200")) return error1;
+                return AjaxResult.success();
+            } else {
+                try {
+                    extracted(dto, order);
+                } catch (Exception e) {
+                    log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
+                    return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
+                }
+                return AjaxResult.success();
             }
-            return AjaxResult.success();
         }
         return AjaxResult.error();
+    }
+
+    private AjaxResult zuofeiYiZhifu(ArrayList<TjFlowingWater> yizhifu, TjCustomer tjCustomer, TjOrder order, String apiUrl, String hospbm, Boolean isDelete, String tjNum) {
+        if (!yizhifu.isEmpty()) {
+            for (TjFlowingWater water : yizhifu) {
+                HashMap<String, Object> map = new HashMap<>();
+                map.put("pationId", tjCustomer.getPationId());
+                map.put("cardId", tjCustomer.getHisJzkh());
+                map.put("tjNum", water.getTjSerialNumber());
+                map.put("kaiDanKs", "7805");
+                // 鏀惰垂鏍囧織 1寰呮敹璐� 2寰呴��璐�
+                map.put("shouTuiStatus", "2");
+                JSONArray array = JSONUtil.createArray();
+                String bldh = water.getJxbz();
+                List<TbTransition> list;
+                if (bldh != null) {
+                    LambdaQueryWrapper<TbTransition> wrapper1 = new LambdaQueryWrapper<>();
+                    wrapper1.eq(TbTransition::getJxbz, bldh);
+                    wrapper1.gt(TbTransition::getOrdPrice, 0);
+                    list = tbTransitionService.list(wrapper1);
+                } else {
+                    LambdaQueryWrapper<TbTransition> wrapper1 = new LambdaQueryWrapper<>();
+                    wrapper1.isNull(TbTransition::getJxbz);
+                    wrapper1.eq(TbTransition::getTjNum, tjNum);
+                    wrapper1.gt(TbTransition::getOrdPrice, 0);
+                    list = tbTransitionService.list(wrapper1);
+                }
+                for (TbTransition transition : list) {
+                    LambdaQueryWrapper<TjProject> queryWrapper = new LambdaQueryWrapper<>();
+                    queryWrapper.eq(TjProject::getProId, transition.getProId());
+                    TjProject project = projectService.getOne(queryWrapper);
+                    LambdaQueryWrapper<TjFlowingWaterHis> wrapper2 = new LambdaQueryWrapper<>();
+                    wrapper2.eq(TjFlowingWaterHis::getParentId, water.getHisWaterId());
+                    wrapper2.eq(TjFlowingWaterHis::getXmId, project.getHisXmbm());
+                    List<TjFlowingWaterHis> list1 = tjFlowingWaterHisService.list(wrapper2);
+                    for (TjFlowingWaterHis waterHis : list1) {
+                        LambdaQueryWrapper<SysDept> wrapper = new LambdaQueryWrapper<>();
+                        wrapper.eq(SysDept::getDeptId, project.getDeptId());
+                        SysDept dept = sysDeptService.getOne(wrapper);
+                        JSONObject obj = JSONUtil.createObj();
+                        BigDecimal danjia = transition.getOrdPrice();
+                        Integer sl = project.getSl();
+                        BigDecimal allPrice = danjia.multiply(new BigDecimal(sl));
+                        obj.putOpt("danJia", danjia);
+                        obj.putOpt("jieSuanJe", allPrice.negate());
+                        obj.putOpt("shuliang", Math.negateExact(sl));
+                        obj.putOpt("feiYongMxId", waterHis.getCurrentId());
+                        obj.putOpt("feiYongId", water.getHisWaterId());
+                        obj.putOpt("zhiXingKs", dept.getDeptId());
+                        obj.putOpt("zhiXingKsMc", dept.getDeptName());
+                        obj.putOpt("shouFeiXmId", project.getHisXmbm());
+                        obj.putOpt("shouFeiXmMc", project.getHisXmmc());
+
+//                    obj.putOpt("zhiXingKs","7805");
+//                    obj.putOpt("zhiXingKsMc","浣撴绉�");
+//                    obj.putOpt("shouFeiXmId","4735346");
+//                    obj.putOpt("shouFeiXmMc","浣撴璐�");
+                        array.add(obj);
+                    }
+
+                }
+                map.put("feiYongInfoList", array);
+                log.info("閫�璐圭敵璇� 鍏ュ弬 -> {}", JSONUtil.toJsonStr(map));
+                String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/creatCostInfo", map);
+                log.info("閫�璐圭敵璇� 杩斿洖 -> {}", JSONUtil.toJsonStr(post));
+                if(null !=post){
+                    JSONObject jsonObject = JSONUtil.parseObj(post);
+                    if (jsonObject.getStr("code").equals("200")) {
+                        // hisTfWaterId
+                        String tfid = jsonObject.getJSONObject("data").getStr("feiYongId");
+                        water.setHisTfWaterId(tfid);
+                        tjFlowingWaterService.updateById(water);
+                        if (isDelete) {
+                            for (TjFlowingWater water1 : yizhifu) {
+                                String bldh1 = water1.getJxbz();
+                                remarkService.deleteTjOrderDetailByjxbz(bldh1);
+                                tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh1);
+                                tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh1);
+                                transitionService.deleteTjOrderDetailByjxbz(bldh1);
+                                blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh1));
+                                tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh1);
+                            }
+                        }
+                    } else return AjaxResult.error();
+                }
+            }
+        }
+        return null;
+    }
+
+    private AjaxResult zuofeiWeiZhifu(ArrayList<TjFlowingWater> weizhifu, TjCustomer tjCustomer, String apiUrl, String hospbm, TjOrder order, Boolean isDelete, String tjNum) {
+        if (!weizhifu.isEmpty()) {
+            HashMap<String, Object> chexiaoMap = new HashMap<>();
+            chexiaoMap.put("pationId", tjCustomer.getPationId());
+            chexiaoMap.put("cardId", tjCustomer.getHisJzkh());
+            String feiyongList = weizhifu.stream().map(TjFlowingWater::getHisWaterId).collect(Collectors.joining(","));
+            chexiaoMap.put("feiYongIdList", feiyongList.trim().replaceAll(" ", ""));
+
+            String post = HttpClientUtils.sendPost(apiUrl + "/api/his/" + hospbm + "/revokeCost", chexiaoMap);
+            if (JSONUtil.parseObj(post).getStr("code").equals("200")) {
+                if (isDelete) {
+                    for (TjFlowingWater water : weizhifu) {
+                        String bldh = water.getJxbz();
+                        if (StrUtil.isNotBlank(bldh)) {
+                            remarkService.deleteTjOrderDetailByjxbz(bldh);
+                            tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
+                            tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
+                            transitionService.deleteTjOrderDetailByjxbz(bldh);
+                            blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, tjNum).eq(TjProBl::getBldh, bldh));
+                            tjSamplingMapper.deleteByTjNumAndCusIdAndJxbzo(tjNum, order.getUserId(), bldh);
+                        } else {
+                            //杩欓噷鍒犻櫎鐨勬槸杩欎釜浜烘墍鏈夐」鐩寘鎷ˉ褰曢」鐩�
+                            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
+                            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
+                            remarkService.deletedOrderRemarkByTjNum(tjNum);
+                            tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
+                            transitionService.deletedTbTransitionByTjNum(tjNum);
+                            tjSamplingMapper.deleteByTjNumAndCusId(order.getTjNumber(), order.getUserId());
+                        }
+
+                    }
+                }
+            } else return AjaxResult.error();
+        }
+        return null;
     }
 
     //    @Transactional(propagation =Propagation.REQUIRES_NEW)
@@ -3139,16 +3597,234 @@
     @GetMapping("/chushenyemianqijianjiekou")
     @ApiOperation(value = "鍒濆椤甸潰寮冩鎺ュ彛")
     @Transactional
-    public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm,@RequestParam String proId) {
-        LambdaQueryWrapper<TjOrderRemark> wq=new LambdaQueryWrapper<>();
-        wq.eq(TjOrderRemark::getTjNumber,tjNUm);
-        wq.eq(TjOrderRemark::getProId,proId);
+    public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+        LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+        wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+        wq.eq(TjOrderRemark::getProId, proId);
         TjOrderRemark remark = remarkService.getOne(wq);
-        remark.setType(1);
+        remark.setType(2);
         remarkService.updateById(remark);
         return AjaxResult.success("鎿嶄綔鎴愬姛!");
     }
 
 
+    @PostMapping("/zongjanyemianshjianzhou")
+    @ApiOperation(value = "鎬绘鑾峰彇鏃堕棿杞存帴鍙�")
+    @Transactional
+    public AjaxResult zongjanyemianshjianzhou(@RequestBody List<String> tjNUms) {
+
+        if (null != tjNUms && !tjNUms.isEmpty()) {
+            List<Map<String, Object>> list = new ArrayList<>();
+            for (String tjNUm : tjNUms) {
+                Map<String, Object> map = new HashMap<>();
+                TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+                if (null != order) {
+                    int czwj = remarkService.panduaniscunzaiweijian(tjNUm);
+                    int sfwc = remarkService.panduaniswancheng(tjNUm);
+                    Date checkTime = order.getCheckTime();
+                    Date reportTime = order.getReportTime();
+                    Integer heshouStatus = order.getHeshouStatus();
+                    Date lastTime = order.getPrintLastTime();
+                    int a = 0;
+                    if (czwj == 0) {
+                        //鏈
+                        a = 0;
+                    }
+                    if (czwj > 0) {
+                        //鍦ㄦ
+                        a = 1;
+                    }
+                    if (sfwc == 0) {
+                        //宸插畬鎴�
+                        a = 2;
+                    }
+                    if (null != checkTime) {
+                        //宸插鏍�
+                        a = 3;
+                    }
+                    if (null != reportTime) {
+                        //鐢熸垚鎶ュ憡
+                        a = 4;
+                    }
+                    if (heshouStatus == 1) {
+                        //鎶ュ憡鏍告敹
+                        a = 5;
+                    }
+                    if (null != lastTime) {
+                        //宸插嚭鎶ュ憡
+                        a = 6;
+                    }
+                    map.put("tjNUm", tjNUm);
+                    map.put("sjz", a);
+                    list.add(map);
+                }
+            }
+            return AjaxResult.success(list);
+        }
+        return AjaxResult.error();
+    }
+
+
+    @PostMapping("/heshouchexiao")
+    @ApiOperation(value = "鎾ら攢鎶ュ憡鎺ュ彛")
+    @Transactional
+    public AjaxResult heshouchexiao(@RequestBody List<String> tjNUms) {
+
+        if (null != tjNUms && !tjNUms.isEmpty()) {
+
+            // 涓嶅湪浣跨敤閫昏緫鍒犻櫎 閫昏緫鍒犻櫎瀵艰嚧鎵撳嵃鎶ュ憡鐢熸垚 鏌ヨsql缂撴參
+            //閫昏緫鍒犻櫎鏁版嵁搴撻噷鐨勬姤鍛�
+            LambdaQueryWrapper<TjReport> wq1 = new LambdaQueryWrapper<>();
+            wq1.select(TjReport::getReId);
+            wq1.in(TjReport::getTjNumber, tjNUms);
+            wq1.eq(TjReport::getPrint, "pdf");
+            List<Long> list = tjReportService.list(wq1).stream().map(TjReport::getReId).collect(Collectors.toList());
+            for (String tjNUm : tjNUms) {
+                TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+                if (null != order) {
+                    order.setHeshouStatus(0);
+                    order.setHeshouTime(null);
+                    order.setHeshouDoctor(null);
+                    order.setPrintLastTime(null);
+                    order.setReportTime(null);
+                    order.setStatus(TjConstants.TJ_WAIT);
+                    if (!tjOrderService.updateById(order)) {
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return AjaxResult.error("鎿嶄綔澶辫触");
+                    }
+                }
+            }
+            int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{}));
+            if (i == 0) {
+                return AjaxResult.error("鎾ゅ洖澶辫触锛�");
+            }
+            return AjaxResult.success("鎿嶄綔鎴愬姛");
+        }
+        return AjaxResult.error();
+    }
+
+
+    @GetMapping("/qiandaodengjitianjiaxiangmubydanweifenzu")
+    @ApiOperation(value = "绛惧埌鐧昏鏍规嵁鍗曚綅鍒嗙粍鑾峰彇浣撴椤圭洰")
+    @Transactional
+    public AjaxResult qiandaodengjitianjiaxiangmubydanweifenzu(@RequestParam String cusIdcard, @RequestParam String groupingId) {
+        try {
+            transitionService.saveTemoTransitionByGroupingId(cusIdcard, groupingId);
+            return AjaxResult.success("鎿嶄綔鎴愬姛!");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error();
+        }
+    }
+
+    @PostMapping("/ttaddtTransition")
+    @ApiOperation(value = "鍥綋娣诲姞杩囨浮琛ㄦ暟鎹�")
+    @Transactional
+    public AjaxResult ttaddtTransition(@RequestBody Map<String, Object> map) {
+        Object packId = map.get("pacId");
+        if (null == map.get("cusId")) return AjaxResult.error("璇烽�夋嫨浣撴浜�");
+        String cusId = map.get("cusId").toString();
+        Object proIds1 = map.get("proIds");
+        List<Long> proIds = null;
+        if (null != proIds1 && !proIds1.equals("")) {
+            proIds = JSON.parseArray(proIds1.toString(), Long.class);
+        }
+        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusId);
+        String cardId = "0";
+        if (null != tjCustomer) {
+            cardId = tjCustomer.getCardId();
+        }
+        if ((null == proIds || proIds.isEmpty()) && (null == packId || packId.equals(""))) {
+            transitionService.deletedTbTransitionByCusId(cusId);
+        }
+        /*濂楅*/
+        if (null != packId && !packId.equals("")) {
+            Long pacId = Long.valueOf(packId.toString());
+            List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
+            if (null == list || list.isEmpty()) {
+                transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
+                String string = transitionService.ttpanduantaocanshifouchongfu(cusId, pacId);
+                if (!StringUtils.isBlank(string)) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("鎿嶄綔澶辫触! 浠ヤ笅椤圭洰宸插瓨鍦�: " + string);
+                }
+                transitionService.ttsaveTemoTransitionByGroupingId(cusId, cardId, pacId.toString());
+
+                //琛ュ樊浠�
+                List<Map<String,Object>> cjMaps = groupingProService.huoquxiangmuchajia(pacId.toString(), cusId);
+                if(null !=cjMaps && !cjMaps.isEmpty()){
+                    for (Map<String, Object> cjMap : cjMaps) {
+                        transitionService.buxiangmuchajia(cusId,pacId.toString(),cjMap.get("xmid").toString(),new BigDecimal(cjMap.get("cj").toString()));
+                    }
+                }
+
+            }
+        }
+
+        //鍗曢」
+        if (null != proIds && !proIds.isEmpty()) {
+            //寮傛淇濆瓨鏁版嵁搴撹〃
+            for (Long proId : proIds) {
+                TjProject project = projectService.selectTjProjectByProId(proId);
+                if (null != project) {
+                    List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
+                    if (null == transitionList || transitionList.isEmpty()) {
+                        transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
+                    }
+                }
+            }
+        }
+        return AjaxResult.success();
+    }
+
+
+    @GetMapping(value = "newgetTransitionList")
+    @ApiOperation(value = "鏈�鏂版煡璇㈣繃娓¤〃鏁版嵁")
+    public AjaxResult newgetTransitionList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId) {
+        List<TbTransition> list= transitionService.newgetTransitionList(cusId);
+        return AjaxResult.success(list);
+    }
+
+    @PostMapping(value = "updateTransitionnewPrice")
+    @ApiOperation(value = "绛惧埌鐧昏椤甸潰鏍规嵁鎶樻墸淇敼椤圭洰鐜颁环")
+    @Transactional
+    public AjaxResult updateTransitionnewPrice(@RequestBody List<UpdateTransitionnewPriceDto> dtos) {
+
+        if(null !=dtos && !dtos.isEmpty()){
+            for (UpdateTransitionnewPriceDto dto : dtos) {
+                LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>();
+                wq.eq(TbTransition::getCusId,dto.getCusIdCard());
+                wq.eq(TbTransition::getParentProId,dto.getParentProId());
+                wq.isNull(TbTransition::getTjNum);
+                List<TbTransition> list = transitionService.list(wq);
+                log.info("淇敼鐨勫鎴疯韩浠借瘉鍙蜂负: "+dto.getCusIdCard());
+                log.info("鐖堕」鐩甶d涓�: "+dto.getParentProId());
+                log.info("鎶樻墸涓�: "+new BigDecimal(dto.getDiscount()));
+                if(null !=list && !list.isEmpty()){
+                    BigDecimal dxzj = transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(),dto.getParentProId());
+                    for (TbTransition transition : list) {
+                        BigDecimal ordPrice = transition.getOrdPrice();
+                        BigDecimal multiply = ordPrice.multiply((new BigDecimal(dto.getDiscount()).divide(BigDecimal.valueOf(10))));
+                        log.info("鍚庣璁＄畻鐨勯噾棰�: "+multiply);
+                        transition.setNowPrice(multiply);
+                        transition.setDiscount(new BigDecimal(dto.getDiscount()));
+                        transitionService.updateById(transition);
+                    }
+                    if(null !=dto.getYhj() && dto.getYhj().compareTo(BigDecimal.ZERO)>=0){
+                        List<TbTransition> transitionList = list.stream().filter(a ->
+                                transitionService.getTbTransitionPriceAndOrdPrice(dto.getCusIdCard(),dto.getParentProId()).subtract(dto.getYhj()).compareTo(BigDecimal.ZERO) >= 0).collect(Collectors.toList());
+                        if(!transitionList.isEmpty()){
+                            TbTransition tbTransition = transitionList.get(0);
+                            tbTransition.setNowPrice(dxzj);
+                            transitionService.updateById(tbTransition);
+                        }
+                    }
+                }
+            }
+        }
+        return AjaxResult.success();
+    }
+
+
 }
 

--
Gitblit v1.8.0