ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -440,25 +440,27 @@ public void zongjianshengchengyichangxiangmu(String s, String yqbm) { TjOrder order = orderService.getOrderByTjNum(s); jcycxmService.deletedByTjh(s); List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId()); if(null !=list && !list.isEmpty()){ for (LtkjExamJcsqd jcsqd : list) { if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，"); for (String jg : split) { if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("无异常") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")&& !jg.contains("无殊")){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(null != order){ jcycxmService.deletedByTjh(s); List<LtkjExamJcsqd> list = jcsqdService.getLtkjJcsqdByTjh(order.getCardId()); if(null !=list && !list.isEmpty()){ for (LtkjExamJcsqd jcsqd : list) { if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;|,|，"); for (String jg : split) { if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("无异常") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")&& !jg.contains("无殊")){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -545,7 +545,7 @@ LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>(); wq1.eq(TjOrder::getUserId, cusId); List<TjOrder> orderList = orderService.list(wq1); if (null != orderList && orderList.size() > 0) { if (null != orderList && !orderList.isEmpty()) { List<TjOrder> orderList0 = new ArrayList<>(); for (TjOrder tjOrder : orderList) { LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>(); @@ -855,14 +855,14 @@ if (configByKey.equals("Y")) { HashMap<String, Object> hisRequestParams = new HashMap<>(); // 不在需要身份证号 hisRequestParams.put("patientId", tjOrder.getCardId()); hisRequestParams.put("patientId", tjOrder.getCardId()); log.info("ltkj--- " + DateUtil.date() + "操作人id: " + userId + "操作科室: " + sysUser.getDeptId() + "操作的体检人: " + tjNumber); AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams); if (Integer.parseInt(queryPay.get("code").toString()) == 200) { int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId()); int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId()); log.info("存储过程返回的是: " + sfsf1 + " 代码返回的是 " + sfsf); if (sfsf > 0 || sfsf1 > 0) { if (sfsf1 > 0) { log.error("路泰科技--- " + DateUtil.date() + " 存在未缴费项目的 就单数 " + sfsf); log.error("路泰科技--- " + DateUtil.date() + " 存在未缴费项目的 就诊号 " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber()); return AjaxResult.error("存在未缴费项目"); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1405,7 +1405,10 @@ 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; if (!ajaxResult.get("code").toString().equals("200")){ throw new IllegalStateException("团体申请单发送失败!" + result.get("msg").toString()); // 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()); ltkj-framework/src/main/java/com/ltkj/framework/web/exception/GlobalExceptionHandler.java
@@ -54,7 +54,7 @@ log.error(e.getMessage(), e); Integer code = e.getCode(); return StringUtils.isNotNull(code) ? AjaxResult.error(code, e.getMessage()) : AjaxResult.error(e.getMessage()); // return AjaxResult.error("数据处理异常，请联系管理员!"); // return AjaxResult.error("数据正在加载中, 请稍等!"); } /** @@ -64,7 +64,7 @@ public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生未知异常.", requestURI, e); return AjaxResult.error("数据处理异常，请联系管理员!"); return AjaxResult.error("数据正在加载中, 请稍等!"); } /** @@ -74,7 +74,7 @@ public AjaxResult handleException(Exception e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',发生系统异常.", requestURI, e); return AjaxResult.error("数据处理异常，请联系管理员!"); return AjaxResult.error("数据正在加载中, 请稍等!"); } /**
