From 59363c48a5977f4df327d87085d4c565c06bc96c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 27 九月 2024 08:39:04 +0800
Subject: [PATCH] zjh20240927  修改驾驶员体检登记失败的问题

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 2b3d4ca..b00ef3f 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -1242,6 +1242,7 @@
                             }
                             if (StrUtil.isNotBlank(ckfw)) {
                                 try {
+                                    if (ckfw != null && ckfw.contains("-")) {
                                     Integer.parseInt(tjOrderDetail.getYcbz());
                                     String[] split = ckfw.split("-");
                                     BigDecimal min = new BigDecimal(split[0]);
@@ -1253,8 +1254,9 @@
                                             tjOrderDetail.setYcbz("鈫�");
                                         } else if (jyjgval.compareTo(max) > 0) {
                                             tjOrderDetail.setYcbz("鈫�");
-                                        }
-                                        else {
+                                        } else if(proResult.contains("闃�")) {
+                                            tjOrderDetail.setYcbz("");
+                                        }else {
                                             tjOrderDetail.setYcbz("");
                                         }
                                         if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
@@ -1263,6 +1265,11 @@
                                     }else {
                                         tjOrderDetail.setYcbz("");
                                     }
+                                    }else {
+                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("");
+
+                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
+                                    }
                                 } catch (NumberFormatException ignored) {
                                     ignored.printStackTrace();
                                 }

--
Gitblit v1.8.0