From fecfd9159283fdeb962586a90d16c25b52af97f3 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Mon, 7 Aug 2017 14:36:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/BasicConfigService.java | 1 + .../web/service/impl/BabyEyePatientServiceImpl.java | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java index a56cbb4..b162e2c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BasicConfigService.java @@ -66,6 +66,7 @@ public class BasicConfigService implements InitializingBean { Map temp = new HashMap<>(); temp.put("id", basicConfig.getId()); temp.put("name", basicConfig.getName()); + list.add(temp); } return list; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java index edf61bc..d3858e0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.enums.FmTypeEnums; import com.lyms.platform.common.enums.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.enums.SexEnum; @@ -12,6 +13,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.service.BabyEyePatientService; +import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.dao.master.BabyEyePatientMapper; import com.lyms.platform.pojo.BabyEyePatient; import com.lyms.platform.pojo.BabyModel; @@ -49,17 +51,27 @@ public class BabyEyePatientServiceImpl implements BabyEyePatientService { @Autowired private BasicConfigFacade basicConfigFacade; + @Autowired + private MongoUtil mongoUtil; + @Override public BaseObjectResponse init() { - List> sex = EnumUtil.toJson(SexEnum.class); + List> sex = EnumUtil.toJson(SexEnum.class, "id", "text"); List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); /** 证件类型 */ List plevelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);; /** 文化程度 */ List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); /** 职业类别 */ List serviceType = ServiceTypeEnums.getServiceTypeList(); /** 服务类型 */ List serviceStatus = ServiceStatusEnums.getServiceStatusList(); /** 服务状态 */ List> nation = basicConfigService.getEnumByParentId(SystemConfig.NATION_TYPE_ID); /** 民族 */ + List fmType = FmTypeEnums.getFmTypeEnums(); /** 分娩方式 */ return RespBuilder.buildSuccess("sex", sex, "cardType", pcerteTypeResult, "plevelType", plevelType, "profession", professionTypeResults, "serviceType", serviceType, - "serviceStatus", serviceStatus, "nation", nation); + "serviceStatus", serviceStatus, "nation", nation, "fmType", fmType); + } + + public static void main(String[] args) { + + List> sex = EnumUtil.toJson(SexEnum.class, "id", "text"); + System.out.println(sex); } @Override @@ -90,6 +102,9 @@ public class BabyEyePatientServiceImpl implements BabyEyePatientService { restMap.put("name", babyEyePatient.getName()); restMap.put("sex", StringUtils.isEmpty(babyEyePatient.getSex()) ? "" : SexEnum.getTextById(Integer.parseInt(babyEyePatient.getSex()))); restMap.put("cardNo", babyEyePatient.getCardNo()); + restMap.put("nationId", mongoUtil.findName(babyEyePatient.getNationId())); + restMap.put("", babyEyePatient.getBirth()); +// restMap.put("", babyEyePatient.); // restMap.put("", babyEyePatient.); // restMap.put("", babyEyePatient.); // restMap.put("", babyEyePatient.); -- 1.8.3.1