From 79b97463b8dfecebca4b27f92c6711d7690b7737 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Mon, 30 Nov 2020 10:46:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E7=AE=A1=E5=BA=8A=E5=A4=A7?=
 =?UTF-8?q?=E5=A4=ABgcdfDoctorId=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/ViewFacade.java   | 14 ++++++++++----
 .../platform/operate/web/request/MatDeliverAddRequest.java |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index fd4691f..9c5513e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -3627,11 +3627,17 @@ public class ViewFacade {
         Map <String, Object> map = new HashMap <>();
         map.put("id", data.getId());
         if (StringUtils.isNotEmpty(data.getGcdfDoctorId())) {
-            Users users = usersService.getUsers(Integer.valueOf(data.getGcdfDoctorId()));
-            Map<String, String> map1 = new HashMap<>();
-            if (null != users) {
-                map.put("gcdfDoctorId", users.getName());
+
+            try {
+                Users users = usersService.getUsers(Integer.valueOf(data.getGcdfDoctorId()));
+                Map<String, String> map1 = new HashMap<>();
+                if (null != users) {
+                    map.put("gcdfDoctorId", users.getName());
+                }
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
             }
+
         }
         if (StringUtils.isNotEmpty( data.getGcdfDoctorId())) {
             Users users = usersService.getUsers(Integer.valueOf( data.getGcdfDoctorId()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
index be34dd8..f0f0b0b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
@@ -16,6 +16,7 @@ import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
+import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
@@ -31,6 +32,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
     private String id;
     //分娩记录加住院管床大夫
+    @Pattern(regexp = ("[0-9]*"),message = "请传入id")
     private String gcdfDoctorId;
     /**
      * 新加字段
-- 
1.8.3.1