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 map = new HashMap(); + Map map = new HashMap(); //证件类型 List 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> list = new ArrayList<>(); + List list = new ArrayList<>(); List results = new ArrayList<>(); if (CollectionUtils.isNotEmpty(patients)) { @@ -191,8 +191,9 @@ public class BookbuildingFacade { list.add(typeMap); - Map mapData = new HashMap<>(); + Map mapData = new HashMap<>(); mapData.put("data",results); + mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); list.add(mapData); BaseListResponse listResponse = new BaseListResponse();