From 3479cfd7b4c20e191c1b657e2fb2c61a32395d01 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Tue, 1 Dec 2020 16:40:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=A6=E5=B9=B3=E7=AE=A1=E5=BA=8A=E5=A4=A7?=
 =?UTF-8?q?=E5=A4=AB=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=92=8C=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/MatDeliverFacade.java   | 17 ++++++++++++-----
 .../lyms/platform/operate/web/facade/ViewFacade.java    |  8 ++------
 .../operate/web/request/MatDeliverAddRequest.java       |  2 +-
 .../operate/web/worker/QuanChanPatientWorker.java       | 14 ++++++++++----
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 29cde86..82415b0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1561,11 +1561,18 @@ public class MatDeliverFacade {
         maternalDeliverResult.setDeliverDoctor(map);
         //分娩记录加住院管床大夫
         if (StringUtils.isNotEmpty(deliverModel.getGcdfDoctorId())) {
-            Users users = usersService.getUsers(Integer.valueOf(deliverModel.getGcdfDoctorId()));
-            Map<String, String> map1 = new HashMap<>();
-            if (null != users) {
-                map1.put("id", users.getId() + "");
-                map1.put("name", users.getName());
+
+            Map<String, String> map1 = null;
+            try {
+                Users users = usersService.getUsers(Integer.valueOf(deliverModel.getGcdfDoctorId()));
+                map1 = new HashMap <>();
+                if (null != users) {
+                    map1.put("id", users.getId() + "");
+                    map1.put("name", users.getName());
+                }
+            } catch (NumberFormatException e) {
+                map.put("id", "-1");
+                map1.put("name", deliverModel.getGcdfDoctorId());
             }
             maternalDeliverResult.setGcdfDoctorId(map1);
         }
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 20e4ab3..c8ecef4 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
@@ -3637,15 +3637,11 @@ public class ViewFacade {
                 }
             } catch (NumberFormatException e) {
                 e.printStackTrace();
+                map.put("gcdfDoctorId", data.getGcdfDoctorId());
             }
 
         }
-        if (StringUtils.isNotEmpty( data.getGcdfDoctorId())) {
-            Users users = usersService.getUsers(Integer.valueOf( data.getGcdfDoctorId()));
-            if (null != users) {
-                map.put("gcdfDoctorId", users.getName());
-            }
-        }
+
         if (StringUtils.isNotEmpty(data.getFmType())) {
             map.put("fmType", FmTypeEnums.getFmDzNameById(data.getFmType()));
         }
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 f0f0b0b..eee0b3d 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
@@ -32,7 +32,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
     private String id;
     //分娩记录加住院管床大夫
-    @Pattern(regexp = ("[0-9]*"),message = "请传入id")
+//    @Pattern(regexp = ("[0-9]*"),message = "请传入id")
     private String gcdfDoctorId;
     /**
      * 新加字段
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
index 2e905e3..3364090 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
@@ -231,10 +231,16 @@ public class QuanChanPatientWorker implements Callable <List <QuanChanResult>> {
                         chanResult.setfCh("");
                     }
                     if (StringUtils.isNotEmpty(maternalDeliverModels.get(0).getGcdfDoctorId())) {
-                        Users users = usersService.getUsers(Integer.valueOf(maternalDeliverModels.get(0).getGcdfDoctorId()));
-                        Map <String, String> map1 = new HashMap <>();
-                        if (null != users) {
-                            chanResult.setGcdfDoctorId(users.getName());//分娩时的管床大夫
+
+                        try {
+                            Users users = usersService.getUsers(Integer.valueOf(maternalDeliverModels.get(0).getGcdfDoctorId()));
+                            Map <String, String> map1 = new HashMap <>();
+                            if (null != users) {
+                                chanResult.setGcdfDoctorId(users.getName());//分娩时的管床大夫
+                            }
+                        } catch (NumberFormatException e) {
+                            e.printStackTrace();
+                            chanResult.setGcdfDoctorId(maternalDeliverModels.get(0).getGcdfDoctorId());//分娩时的管床大夫
                         }
                     }
 
-- 
1.8.3.1