From af6f1f6ad2f3fffeeed75f1a742a5bb63141db60 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 01 八月 2024 18:44:34 +0800
Subject: [PATCH] zjh 2024/08/01-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java |  150 ++++++++++++++++++++++++++-----------------------
 1 files changed, 79 insertions(+), 71 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index b4a37a5..48cd280 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
@@ -386,6 +386,7 @@
                                    @ApiParam (value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam (defaultValue = "10") Integer pageSize,
                                    @ApiParam (value = "浣撴鍙�)") @RequestParam (required = false) String tjNum,
                                    @ApiParam (value = "濮撳悕)") @RequestParam (required = false) String name,
+                                   @ApiParam (value = "椤圭洰鍚�)") @RequestParam (required = false) String xmmc,
                                    @ApiParam (value = "鐧昏寮�濮嬫椂闂�") @RequestParam (required = false) Date djbeginTime,
                                    @ApiParam (value = "鐧昏缁撴潫鏃堕棿") @RequestParam (required = false) Date djendTime,
                                    @ApiParam (value = "鎶ュ憡寮�濮嬫椂闂�") @RequestParam (required = false) Date bgbeginTime,
@@ -459,6 +460,12 @@
         if (null != tjNum) {
             wq.eq(TjOrder::getTjNumber, tjNum);
         }
+
+
+        if (null != xmmc) {
+            wq.in(TjOrder::getTjNumber, projectService.getTjNumLIstByXmmx(xmmc));
+        }
+
         wq.orderByDesc(TjOrder::getCreateTime);
         Page<TjOrder> page2 = tjOrderService.page(page1, wq);
         List<TjOrder> list = page2.getRecords();
@@ -470,7 +477,6 @@
                     order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                     order.setTjCustomerName(tjCustomer.getCusName());
                     order.setTjCustomerPhone(tjCustomer.getCusPhone());
-//                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                     order.setTjCusIdCard(tjCustomer.getCusIdcard());
                     order.setCareer(tjCustomer.getCareer());
                     order.setIdType(tjCustomer.getIdType());
@@ -484,7 +490,7 @@
                 if (null != order.getPacId()) {
                     if (null != tjPackageService.getById(order.getPacId())) {
                         order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
-                    }
+                    }else
                     if (null != dwDeptService.getById(order.getPacId())) {
                         order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
                     }
@@ -966,7 +972,7 @@
             Long cusNumber = tjCustomer.getCusNumber();
             cusNumber += 1;
             tjCustomer.setCusNumber(cusNumber);
-            BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount())).divide(BigDecimal.valueOf(10));
+            BigDecimal discount = BigDecimal.valueOf(Double.parseDouble(tjOrder.getTjFlowingWater().getDiscount()));
             TjFlowingWater tjFlowingWater = new TjFlowingWater();
             tjFlowingWater.setPayStasus(0L);
             if ("1".equals(tjOrder.getTjType())) {
@@ -1030,6 +1036,44 @@
 
             }
 
+            //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
+            transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+
+            /*璋冪敤his鎺ュ彛*/
+            String config = configService.selectConfigByKey("sfkqdyhis");
+            if (null != config && config.equals("Y")) {
+                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer,tjOrder);
+                if (!result.get("code").toString().equals("200")) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    Object jzh = result.get("jzh");
+                    if(null !=jzh && null !=jzh.toString()){
+                        hisApiMethod.ZfHisApiMethod(jzh.toString());
+                    }
+                    return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
+                }
+
+                log.info("璇ョ櫥璁颁汉鐨刪is灏辫瘖鍙锋槸: "+tjOrder.getCardId());
+                //鍥綋
+                if ("1".equals(tjOrder.getTjType())) {
+                    asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
+                }
+                //涓汉
+                if ("2".equals(tjOrder.getTjType())) {
+                    //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+                    newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+                }
+                hisApiMethod.tijianshenqing(tjCustomer,DateUtil.format(date1,"yyyy-MM-dd HH:mm:ss"),tjOrder.getCardId());
+
+                return AjaxResult.success(tjNumber);
+            } else {
+                tjCustomer.setCardId(tjOrder.getTjNumber());
+                tjCustomerService.updateById(tjCustomer);
+                transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
+                tjOrder.setCardId(tjOrder.getTjNumber());
+                tjOrderService.updateById(tjOrder);
+            }
+
+
             //鍥綋
             if ("1".equals(tjOrder.getTjType())) {
                 asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
@@ -1038,46 +1082,6 @@
             if ("2".equals(tjOrder.getTjType())) {
                 //asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                 newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
-            }
-
-            //璋冪敤SQL server鎷垮彇鏀惰垂鎯呭喌
-            //鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
-//            final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
-//            if ("Y".equals(getInfoFromSqlData)){
-//                List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
-//                if (one!=null){
-//                    for (LtkjMiddleHead ltkjMiddleHead : one) {
-//                        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-//                        headService.save(ltkjMiddleHead);
-//                        DynamicDataSourceContextHolder.clearDataSourceType();
-//                        List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
-//                        if (detailList!=null){
-//                            for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
-//                                DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-//                                middleDetailService.save(ltkjMiddleDetail);
-//                                DynamicDataSourceContextHolder.clearDataSourceType();
-//                            }
-//                        }
-//                    }
-//
-//                }
-//            }
-
-
-            /*璋冪敤his鎺ュ彛*/
-            String config = configService.selectConfigByKey("sfkqdyhis");
-            if (null != config && config.equals("Y")) {
-                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
-                if (!result.get("code").toString().equals("200")) {
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
-                }
-            } else {
-                tjCustomer.setCardId(tjOrder.getTjNumber());
-                tjCustomerService.updateById(tjCustomer);
-                transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
-                tjOrder.setCardId(tjOrder.getTjNumber());
-                tjOrderService.updateById(tjOrder);
             }
             return AjaxResult.success(tjNumber);
         }
@@ -2357,14 +2361,13 @@
     public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
         tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
         if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
-            tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+            tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
         } else {
-            tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
+            tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
         }
 
-        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
-        //淇敼姣忛」鐨勫師浠风幇浠� //淇敼涓存椂琛ㄤ綋妫�鍙�
-        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
+        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(),String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
+
         //娣诲姞remark琛ㄦ暟鎹�
         if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
             remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
@@ -2389,7 +2392,6 @@
             tjFlowingWaterService.updateById(tjFlowingWater);
             asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser);
         }
-//        System.out.println("杩欐浠g爜鏃堕棿" + (System.currentTimeMillis() - l));
     }
 
 
@@ -2548,31 +2550,31 @@
             tjCustomerService.updateById(customer);
             String configByKey = configService.selectConfigByKey("sfkqdyhis");
             if (configByKey.equals("Y")) {
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("cardtype", "4");
-//                map.put("input", order.getCardId());
-                map.put("input", customer.getPationId());
-                LocalDate currentDate = LocalDate.now();
-                LocalDateTime startOfDay = currentDate.atStartOfDay();
-                LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
-                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                String ksrq = startOfDay.format(formatter);
-                String jsrq = nineteenOClock.format(formatter);
-                map.put("ksrq", ksrq);
-                map.put("jsrq", jsrq);
-                AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
-                if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
-                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
-                } else {
-                    boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
-                    if (zfHisApiMethods) {
-                        return AjaxResult.success("鎾ら攢鎴愬姛", map);
-                    } else {
+
+                HashMap<String, Object> hisRequestParams = new HashMap<>();
+                hisRequestParams.put("patientId", order.getCardId());
+                AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+                if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+                    List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
+
+                    BigDecimal cateFeeAll = BigDecimal.ZERO;
+                    for (Map<String, String> datum : data) {
+                        BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+                        cateFeeAll = cateFeeAll.add(cateFee);
+                    }
+                    if (cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+                        return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
                     }
                 }
+                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+                if (zfHisApiMethods) {
+                    return AjaxResult.success("鎾ら攢鎴愬姛");
+                } else {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+                }
+
             }
             return AjaxResult.success("鎾ら攢鎴愬姛!!!");
         }
@@ -2828,6 +2830,12 @@
                     if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
                         return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
                     }
+
+                }
+                boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
+                if(!b){
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
                 }
             }
             for (String bldh : dto.getBldhs()) {

--
Gitblit v1.8.0