From 1920a920b7a34be3fadbea3a6b925a4a60c6140b Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 1 Jul 2016 09:44:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BB=BA=E6=A1=A3?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/controller/EnumsController.java    | 2 +-
 .../com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 4 +++-
 .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java     | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
index 0e84b6a..b051c69 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
@@ -216,7 +216,7 @@ public class EnumsController {
     }
 
     /**
-     * 服务类型
+     * 服务状态
      * @return
      */
     @RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET)
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 053f9f7..3dc3c3e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -399,7 +399,7 @@ public class BabyBookbuildingFacade {
 	 * @return
 	 */
 	public BaseObjectResponse getBabyBuildBaseConfig() {
-		Map<String,List> map = new HashMap();
+		Map<String,Object> map = new HashMap();
 
 		//证件类型
 		List<BasicConfigResult>  pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
@@ -437,6 +437,8 @@ public class BabyBookbuildingFacade {
 		List  expType = ExpEnums.getExpEnums();
 		map.put("expType", expType);
 
+		map.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date()));
+
 
 
 		BaseObjectResponse objectResponse = new BaseObjectResponse();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 65e538c..6bb084a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -131,7 +131,7 @@ public class BookbuildingFacade {
 		}
 
 		//历史建档记录
-		List<Map<String,List>> list = new ArrayList<>();
+		List<Map> list = new ArrayList<>();
 		List<BookbuildingRecordResult> results = new ArrayList<>();
 		if (CollectionUtils.isNotEmpty(patients))
 		{
@@ -191,8 +191,9 @@ public class BookbuildingFacade {
 		list.add(typeMap);
 
 
-		Map<String,List> mapData  = new HashMap<>();
+		Map<String,Object> mapData  = new HashMap<>();
 		mapData.put("data",results);
+		mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date()));
 		list.add(mapData);
 
 		BaseListResponse listResponse = new BaseListResponse();
-- 
1.8.3.1