From ed0e0ca175d99bebf0ee534d7e6d9cc1196652e1 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Sun, 13 Jan 2019 15:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/common/utils/ExcelUtil.java     | 2 +-
 .../lyms/platform/operate/web/controller/MatDeliverController.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
index 35ed7ec..8d03156 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java
@@ -231,7 +231,7 @@ public class ExcelUtil
 
         }
 
-        public static void writeWhExclFile(String filePath,OutputStream out,List<Map<String,String>> values) {
+        public static void writeWhExclFile(String filePath,OutputStream out,List<Map<String,Object>> values) {
                 File file = new File(filePath);
                 InputStream in = null;
                 Workbook wb = null;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index b9e5033..6250f32 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -303,17 +303,17 @@ public class MatDeliverController extends BaseController{
             // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
             @SuppressWarnings("unchecked")
             List<ChildbirthManagerQueryModel> childbirthManagerQueryModelList = matDeliverFacade.childbirthManager(childbirthManagerRequest).getData();
-            List<Map<String, String>> list = new LinkedList<>();
+            List<Map<String, Object>> list = new LinkedList<>();
             int num = 0;
             for (ChildbirthManagerQueryModel queryModel : childbirthManagerQueryModelList) {
 
                 Patients patients = patientsService.findOnePatientById(queryModel.getPatientId());
-                Map<String, String> map = new LinkedHashMap<>();
+                Map<String, Object> map = new LinkedHashMap<>();
                 map.put("num",String.valueOf(num));
                 map.put("dueDate",queryModel.getDueDate());
                 map.put("fmTime",queryModel.getFmTime());
                 if(StringUtils.isNotEmpty(queryModel.getBhnum())){
-                    map.put("zyNo",queryModel.getBhnum());
+                    map.put("zyNo","00009");
                 }else {
                     map.put("zyNo", "-");
                 }
-- 
1.8.3.1