diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index 5add2d8..8ba1c38 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -433,6 +433,17 @@ public class PreEugenicsBaseModel extends BaseModel { //隆化-孕前优生上传省平台是否上传成功 key:模块名称 value:0：失败，1：成功 private Map isUploadingYn; + //隆化- 村级区划接口文档需要,隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 + private String subUnitsVillage; + + public String getSubUnitsVillage() { + return subUnitsVillage; + } + + public void setSubUnitsVillage(String subUnitsVillage) { + this.subUnitsVillage = subUnitsVillage; + } + public Map getIsUploadingYn() { return isUploadingYn; } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index 550b562..4d95b6c 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -951,14 +951,16 @@ public class LhxfyService { */ private static final String URL = "http://39.101.222.193:8088";//测试 private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key - public void uploadingProvince(){ + public void uploadingProvince(String id){ try { Query query = new Query(); //documentId不存在的说明已经成功上传过。 - query.addCriteria(Criteria.where("documentId").exists(false)); + query.addCriteria(Criteria.where("id").is(id)); List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) { - //上传孕前档案基本信息 + //隆化- 村级区划接口文档需要,隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值 + preEugenicsBaseModel.setSubUnitsVillage("130825100227"); + //上传孕前档案基本信息4.1 String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"), lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY)); if(StringUtils.isNotEmpty(result1)){ @@ -1064,7 +1066,7 @@ public class LhxfyService { LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost",null); } //上传孕前检查结果及评估建议4.7 - String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") + /*String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment") ,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,documentId)); if(StringUtils.isNotEmpty(result7)){ List list7=JsonUtil.jsonToList(result7, UploadResult.class); @@ -1085,9 +1087,9 @@ public class LhxfyService { Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败 mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class); LogUtil.taskError("上传异常：result7=HttpClientUtil.doWebServicePost",null); - } + }*/ //上传孕前早孕随访4.8 - String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") + /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow") ,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,documentId)); if(StringUtils.isNotEmpty(result8)){ List list8=JsonUtil.jsonToList(result8, UploadResult.class); @@ -1108,9 +1110,9 @@ public class LhxfyService { Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败 mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class); LogUtil.taskError("上传异常：result8=HttpClientUtil.doWebServicePost",null); - } + }*/ //上传孕前妊娠结局4.9 - String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") + /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome") ,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,documentId)); if(StringUtils.isNotEmpty(result9)){ List list9=JsonUtil.jsonToList(result9, UploadResult.class); @@ -1131,7 +1133,7 @@ public class LhxfyService { Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败 mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class); LogUtil.taskError("上传异常：result9=HttpClientUtil.doWebServicePost",null); - } + }*/ }else { Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId())); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java index bf226bb..526eaaa 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java @@ -2,12 +2,19 @@ package com.lyms.hospitalapi.lhxfy; import com.lyms.hospitalapi.lhxfy.model.Archives; import com.lyms.hospitalapi.lhxfy.model.UploadResult; +import com.lyms.hospitalapi.lhxfy.model.enums.CardTypeEnums; +import com.lyms.hospitalapi.lhxfy.model.enums.CareerEnums; +import com.lyms.hospitalapi.lhxfy.model.enums.EducationalEnums; +import com.lyms.hospitalapi.lhxfy.model.enums.NationEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; +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.permission.model.Organization; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.PreEugenicsBaseModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -24,6 +31,12 @@ import java.util.Map; public class LhxfyUploadingProvince { @Autowired private BasicConfigFacade basicConfigFacade; + @Autowired + private AutoMatchFacade autoMatchFacade; + @Autowired + private OrganizationService organizationService; + @Autowired + private LhxfyService lhxfyService; //上传孕前档案基本信息4.1 public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key){ @@ -31,58 +44,130 @@ public class LhxfyUploadingProvince { archives.setKey(key);// 上传需要的密钥 archives.setDocName(baseModel.getDoctor());// 医师签名 archives.setFillTime(DateUtil.getyyyy_MM_dd(baseModel.getFillDate()));// 填写日期 - archives.setIsCharge(null);// 收费类型 01 免费 02 收费 - archives.setCountyName(null);// 县级服务机构名称 - archives.setVillageName(null);// 乡级服务机构名称 + archives.setIsCharge("01");// 收费类型 01 免费 02 收费 + //医院名称 + Organization org = organizationService.getOrganization(Integer.valueOf(baseModel.getHospitalId())); + archives.setCountyName(StringUtils.isNotEmpty(org.getName())?org.getName():"");// 县级服务机构名称 + archives.setVillageName("计划生育服务站");// 乡级服务机构名称（计划生育服务站）写死 archives.setWifeName(baseModel.getWifeName());// 妻子姓名 archives.setWife_idCard(baseModel.getWifeCardNo());// 妻子身份证号 archives.setWifeAge(baseModel.getWifeAge());// 妻子年龄 archives.setWifeBirth(DateUtil.getyyyy_MM_dd(baseModel.getWifeBirthday()));// 妻子出生时间 + //民族 + String wifeNationCode=null; List nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); for (BasicConfigResult nationResult : nationResults) { + if(baseModel.getWifeNation().equals(nationResult.getId())){ + wifeNationCode=nationResult.getName(); + } + } + archives.setWifeNationCode(NationEnums.getId(wifeNationCode));// 妻子民族编码（具体 + // 妻子文化程度 + String wifeEducational=null; + List levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID); + for (BasicConfigResult educational : levelType) { + if(baseModel.getWifeEducational().equals(educational.getId())){ + wifeEducational=educational.getName(); + } + } + archives.setWifeCultureCode(EducationalEnums.getId(wifeEducational));// 妻子文化程度01： + archives.setWifeRegisteredCode(baseModel.getWifeAccountNature().equals("1")?"01":"02");// 妻子户口性质 01 农业户口 02 非农业户口 + //职业 + String wifeCareer=null; + List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); + for (BasicConfigResult professionTypeResult : professionTypeResults) { + if(baseModel.getWifeCareer().equals(professionTypeResult.getId())){ + wifeCareer=professionTypeResult.getName(); + } } - archives.setWifeNationCode(null);// 妻子民族编码（具体 - archives.setWifeCultureCode(null);// 妻子文化程度01： - archives.setWifeRegisteredCode(null);// 妻子户口性(); - archives.setWifeOccupationCode(null);// 妻子职业（(); - archives.setMotherLandline(null);// 座机号 + archives.setWifeOccupationCode(StringUtils.isNotEmpty(CareerEnums.getId(wifeCareer))?CareerEnums.getId(wifeCareer):"");// 妻子职业 + archives.setMotherLandline(baseModel.getFixedLineTelephone());// 座机号 archives.setMotherEmail(null);// 邮箱 archives.setMotherQQ(null);// QQ archives.setMotherWechat(null);// 妻子微信 - archives.setWifeOccupationCodeContent(null);// - archives.setWifeTelephone(null);// 妻子联系电话 - archives.setWifeCertificatesCode(null);// 妻子证件类 - archives.setWife_current_village(null);// 妻子现住址 - archives.setWife_regist_village(null);// 妻子户口村 - archives.setHusbandName(null);// 丈夫姓名 - archives.setHusbandTelephone(null);// 丈夫联系电话 - archives.setHusbandAge(null);// 丈夫年龄 - archives.setHusbandCode(null);// 丈夫邮编 + archives.setWifeOccupationCodeContent(null);//妻子职业07的其他的时候存入的信息 + archives.setWifeTelephone(baseModel.getWifePhone());// 妻子联系电话 + //妻子证件类型 + String wifeCardType=null; + List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); + for (BasicConfigResult basicConfigResult : pcerteTypeResult) { + if(baseModel.getWifeCardType().equals(basicConfigResult.getId())){ + wifeCardType=basicConfigResult.getName(); + } + } + archives.setWifeCertificatesCode(CardTypeEnums.getId(wifeCardType));// 妻子证件类(传空的话默认01) + //妻子现住址村级区划（只传街道id） + archives.setWife_current_village(lhxfyService.getPreeugenicsAddr(baseModel.getWifeCurrentStreet())); + //妻子户口村级区划（只传街道id） + archives.setWife_regist_village(lhxfyService.getPreeugenicsAddr(baseModel.getWifeCurrentStreet())); + archives.setHusbandName(baseModel.getHusbandName());// 丈夫姓名 + archives.setHusbandTelephone(baseModel.getHusbandPhone());// 丈夫联系电话 + archives.setHusbandAge(baseModel.getHusbandAge());// 丈夫年龄 + archives.setHusbandCode(StringUtils.isNotEmpty(baseModel.getHusbandZipCode())?baseModel.getHusbandZipCode():"000000");// 丈夫邮编 archives.setFatherEmail(null);// 邮箱 archives.setFatherQQ(null);// QQ archives.setFatherWechat(null);// 丈夫微信 - archives.setHusband_idCard(null);// 丈夫身份证号 - archives.setHusbandBirth(null);// 丈夫出生时间 - archives.setHusbandNationCode(null);// 丈夫民族编 - archives.setHusbandCultureCode(null);// 丈夫文化程 - archives.setHusbandRegisteredCode(null);// - archives.setHusbandOccupationCode(null);// - archives.setHusbandOccupationCodeContent(null); - archives.setHusbandCertificatesCode(null);// 丈 - archives.setHusband_village(null);// 丈夫户口村级区划 - archives.setZipCode(null);// 妻子邮编 - archives.setMarriageTime(null);// 结婚时间 - archives.setSubUnitsVillage(null);// 隶属单位 村级区划 - archives.setMarriageTypeCode(null);// 婚姻状态01：初婚 + archives.setHusband_idCard(baseModel.getHusbandCardNo());// 丈夫身份证号 + archives.setHusbandBirth(DateUtil.getyyyy_MM_dd(baseModel.getHusbandBirthday()));// 丈夫出生时间 + //民族 + String husbandNation=null; + List nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID); + for (BasicConfigResult nationResult : nationResults2) { + if(baseModel.getHusbandNation().equals(nationResult.getId())){ + husbandNation=nationResult.getName(); + } + } + archives.setHusbandNationCode(NationEnums.getId(wifeNationCode));// 丈夫民族编码 + // 丈夫文化程度 + String husbandEducational=null; + List levelType2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID); + for (BasicConfigResult educational : levelType2) { + if(baseModel.getHusbandEducational().equals(educational.getId())){ + husbandEducational=educational.getName(); + } + } + archives.setHusbandCultureCode(EducationalEnums.getId(husbandEducational));// 丈夫文化程 + archives.setHusbandRegisteredCode(baseModel.getHusbandAccountNature().equals("1")?"01":"02");// 丈夫户口性质01 农业户口 02 非农业户口 + //丈夫职业 + String husbandCareer=null; + List professionTypeResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); + for (BasicConfigResult professionTypeResult : professionTypeResults2) { + if(baseModel.getHusbandCareer().equals(professionTypeResult.getId())){ + husbandCareer=professionTypeResult.getName(); + } + } + archives.setHusbandOccupationCode(StringUtils.isNotEmpty(CareerEnums.getId(husbandCareer))?CareerEnums.getId(husbandCareer):"");// 丈夫职业 + archives.setHusbandOccupationCodeContent(null);//丈夫职业07的时候需要存入信息 + //丈夫证件类型(传空的话默认01)01:居民身份证02:护照 03: 港澳居民身份证04:军官证 05: 其他有效证件 + archives.setHusbandCertificatesCode(CardTypeEnums.getId(baseModel.getHusbandCardType())); + + archives.setHusband_village(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandCurrentStreet()));// 丈夫户口村级区划 + archives.setZipCode(StringUtils.isNotEmpty(baseModel.getWifeZipCode())?baseModel.getWifeZipCode():"000000");// 妻子邮编 + archives.setMarriageTime(DateUtil.getyyyy_MM_dd(baseModel.getMarriageTime()));// 结婚时间 + //隶属单位 村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227 + archives.setSubUnitsVillage(baseModel.getSubUnitsVillage()); + archives.setMarriageTypeCode(null);// 婚姻状态01：初婚 02：再婚 03：复婚 archives.setFloatingCode(null);// 是否流动人口 1 是 2 - archives.setPeriMarriageEducation(null);// 优 - archives.setIsPection(null);// 是否同步到婚检 1是 0 + archives.setPeriMarriageEducation("01");// 优生健康教育 下拉选 01双方接受教育 02 男方接受教育 03 女方接受教育（系统没有字段必填默认01） + archives.setIsPection(null);// 是否同步到婚检 1是 0否 archives.setHusbandWorkUnit(null);// 丈夫工作单位 - archives.setHusbandResidentialCategory(null);// + archives.setHusbandResidentialCategory("01");//丈夫居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01） archives.setWifeWorkUnit(null);// 妻子工作单位 - archives.setWifeResidentialCategory(null);// 妻 - archives.setHusbandAddressVillage(null);// 丈 + archives.setWifeResidentialCategory("01");//妻子居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01） + archives.setHusbandAddressVillage(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandCurrentStreet()));// 丈夫现住址村级区划（只传街道id） + switch (baseModel.getHasSignBook()){ + case "1": + baseModel.setHasSignBook("01"); + break; + case "2": + baseModel.setHasSignBook("02"); + break; + case "3": + baseModel.setHasSignBook("03"); + break; + } + archives.setInformedConsent(baseModel.getHasSignBook());// 知情同意书签署情况 01男方签署 02 女方签署 03 双方签署 return JsonUtil.obj2Str(archives); } //上传孕前一般情况4.3 diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java new file mode 100644 index 0000000..03f194c --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java @@ -0,0 +1,62 @@ +package com.lyms.hospitalapi.lhxfy.model.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 4.11附表 + * 民族 + */ +public enum CardTypeEnums { + Nation01("01", "身份证/居民身份证"), + Nation02("02", "护照"), + Nation03("03", "港澳居民身份证"), + Nation04("04", "军官证"), + Nation05("05", "其他有效证件/士官证/手机号/二维码"); + + + CardTypeEnums(String id, String name) { + this.id = id; + this.name = name; + } + + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) return ""; + CardTypeEnums[] values = CardTypeEnums.values(); + for (CardTypeEnums value : values) { + if (value.getId().equals(id)) { + return value.getName(); + } + } + return ""; + } + public static String getId(String name) { + if(StringUtils.isEmpty(name)) return "01";//(传空的话默认01) + CardTypeEnums[] values = CardTypeEnums.values(); + for (CardTypeEnums value : values) { + if (value.getName().contains(name)) { + return value.getId(); + } + } + return ""; + } + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CareerEnums.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CareerEnums.java index 1359fa6..5de38e5 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CareerEnums.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CareerEnums.java @@ -1,5 +1,7 @@ package com.lyms.hospitalapi.lhxfy.model.enums; +import com.lyms.platform.common.utils.StringUtils; + /** * 4.11附表 * 职业 @@ -20,6 +22,7 @@ public enum CareerEnums { public static String getName(String id) { + if(StringUtils.isEmpty(id)) return ""; CareerEnums[] values = CareerEnums.values(); for (CareerEnums value : values) { if (value.getId().equals(id)) { @@ -29,9 +32,10 @@ public enum CareerEnums { return ""; } public static String getId(String name) { + if(StringUtils.isEmpty(name)) return ""; CareerEnums[] values = CareerEnums.values(); for (CareerEnums value : values) { - if (value.getName().equals(name)) { + if (value.getName().contains(name)) { return value.getId(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/DiseaseEnums.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/DiseaseEnums.java index 8891356..ce31efb 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/DiseaseEnums.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/DiseaseEnums.java @@ -1,5 +1,7 @@ package com.lyms.hospitalapi.lhxfy.model.enums; +import com.lyms.platform.common.utils.StringUtils; + /** * 4.11附表 * 出生缺陷儿--病种类型 @@ -48,6 +50,7 @@ public enum DiseaseEnums { public static String getName(String id) { + if(StringUtils.isEmpty(id)) return ""; DiseaseEnums[] values = DiseaseEnums.values(); for (DiseaseEnums value : values) { if (value.getId().equals(id)) { @@ -57,9 +60,10 @@ public enum DiseaseEnums { return ""; } public static String getId(String name) { + if(StringUtils.isEmpty(name)) return ""; DiseaseEnums[] values = DiseaseEnums.values(); for (DiseaseEnums value : values) { - if (value.getName().equals(name)) { + if (value.getName().contains(name)) { return value.getId(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/EducationalEnums.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/EducationalEnums.java new file mode 100644 index 0000000..b28d05c --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/EducationalEnums.java @@ -0,0 +1,57 @@ +package com.lyms.hospitalapi.lhxfy.model.enums; + +import com.lyms.platform.common.utils.StringUtils; + +public enum EducationalEnums { + Educational01("01", "文盲/文盲与半文盲"), + Educational02("02", "小学"), + Educational03("03", "初中"), + Educational04("04", "高中/中专/中技/中专和中技/技工学校"), + Educational05("05", "大专/大本/本科"), + Educational06("06", "硕士研究生/博士研究生/博士后/博士/硕士"); + + EducationalEnums(String id, String name) { + this.id = id; + this.name = name; + } + + + public static String getName(String id) { + EducationalEnums[] values = EducationalEnums.values(); + for (EducationalEnums value : values) { + if (value.getId().equals(id)) { + return value.getName(); + } + } + return ""; + } + public static String getId(String name) { + if(StringUtils.isEmpty(name)) return ""; + EducationalEnums[] values = EducationalEnums.values(); + for (EducationalEnums value : values) { + if (value.getName().contains(name)) { + return value.getId(); + } + } + return ""; + } + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/NationEnums.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/NationEnums.java index 0c78997..2a17495 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/NationEnums.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/NationEnums.java @@ -1,5 +1,7 @@ package com.lyms.hospitalapi.lhxfy.model.enums; +import com.lyms.platform.common.utils.StringUtils; + /** * 4.11附表 * 民族 @@ -69,6 +71,7 @@ public enum NationEnums { public static String getName(String id) { + if(StringUtils.isEmpty(id)) return ""; NationEnums[] values = NationEnums.values(); for (NationEnums value : values) { if (value.getId().equals(id)) { @@ -78,9 +81,10 @@ public enum NationEnums { return ""; } public static String getId(String name) { + if(StringUtils.isEmpty(name)) return ""; NationEnums[] values = NationEnums.values(); for (NationEnums value : values) { - if (value.getName().equals(name)) { + if (value.getName().contains(name)) { return value.getId(); } }