jiangjiazhi / regional-platform

Commit 0c52039bf4915bbfb53d2f500cfede3d04b6b6d6

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

4.1上传孕前档案基本信息

Showing 8 changed files with 276 additions and 47 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyUploadingProvince.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CardTypeEnums.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/CareerEnums.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/DiseaseEnums.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/EducationalEnums.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/model/enums/NationEnums.java

...	...	@@ -433,6 +433,17 @@
433	433	//隆化-孕前优生上传省平台是否上传成功 key:模块名称 value:0：失败，1：成功
434	434	private Map<String,Integer> isUploadingYn;
435	435
	436	+ //隆化- 村级区划接口文档需要,隶属单位村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值
	437	+ private String subUnitsVillage;
	438	+
	439	+ public String getSubUnitsVillage() {
	440	+ return subUnitsVillage;
	441	+ }
	442	+
	443	+ public void setSubUnitsVillage(String subUnitsVillage) {
	444	+ this.subUnitsVillage = subUnitsVillage;
	445	+ }
	446	+
436	447	public Map<String, Integer> getIsUploadingYn() {
437	448	return isUploadingYn;
438	449	}

...	...	@@ -951,14 +951,16 @@
951	951	*/
952	952	private static final String URL = "http://39.101.222.193:8088";//测试
953	953	private static final String KEY = "27d7bc6992724608bbfa0775a31c4b38";//沧州测试key
954		- public void uploadingProvince(){
	954	+ public void uploadingProvince(String id){
955	955	try {
956	956	Query query = new Query();
957	957	//documentId不存在的说明已经成功上传过。
958		- query.addCriteria(Criteria.where("documentId").exists(false));
	958	+ query.addCriteria(Criteria.where("id").is(id));
959	959	List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);
960	960	for (PreEugenicsBaseModel preEugenicsBaseModel : preEugenicsBaseModels) {
961		- //上传孕前档案基本信息
	961	+ //隆化- 村级区划接口文档需要,隶属单位村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227以后别的地区直接传值
	962	+ preEugenicsBaseModel.setSubUnitsVillage("130825100227");
	963	+ //上传孕前档案基本信息4.1
962	964	String result1=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadArchives"),
963	965	lhxfyUploadingProvince.uploadingProvinceArchives(preEugenicsBaseModel,KEY));
964	966	if(StringUtils.isNotEmpty(result1)){
...	...	@@ -1064,7 +1066,7 @@
1064	1066	LogUtil.taskError("上传异常：result6=HttpClientUtil.doWebServicePost",null);
1065	1067	}
1066	1068	//上传孕前检查结果及评估建议4.7
1067		- String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
	1069	+ /*String result7=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalAssessment")
1068	1070	,lhxfyUploadingProvince.uploadingProvinceResultAdvice(preEugenicsBaseModel,documentId));
1069	1071	if(StringUtils.isNotEmpty(result7)){
1070	1072	List<UploadResult> list7=JsonUtil.jsonToList(result7, UploadResult.class);
1071	1073
...	...	@@ -1085,9 +1087,9 @@
1085	1087	Update update7 = new Update().set("isUploadingYn.resultAdvice", 0);//失败
1086	1088	mongoTemplate.updateFirst(baseQuery7, update7, PreEugenicsBaseModel.class);
1087	1089	LogUtil.taskError("上传异常：result7=HttpClientUtil.doWebServicePost",null);
1088		- }
	1090	+ }*/
1089	1091	//上传孕前早孕随访4.8
1090		- String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
	1092	+ /*String result8=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalEarlyFollow")
1091	1093	,lhxfyUploadingProvince.uploadingProvincePregnancyFollowTab(preEugenicsBaseModel,documentId));
1092	1094	if(StringUtils.isNotEmpty(result8)){
1093	1095	List<UploadResult> list8=JsonUtil.jsonToList(result8, UploadResult.class);
1094	1096
...	...	@@ -1108,9 +1110,9 @@
1108	1110	Update update8 = new Update().set("isUploadingYn.pregnancyFollowTab", 0);//失败
1109	1111	mongoTemplate.updateFirst(baseQuery8, update8, PreEugenicsBaseModel.class);
1110	1112	LogUtil.taskError("上传异常：result8=HttpClientUtil.doWebServicePost",null);
1111		- }
	1113	+ }*/
1112	1114	//上传孕前妊娠结局4.9
1113		- String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
	1115	+ /*String result9=HttpClientUtil.doWebServicePost((URL+"/m/antenatalUpload/uploadAntenatalPregnancyOutcome")
1114	1116	,lhxfyUploadingProvince.uploadingProvinceGravidityEndingTab(preEugenicsBaseModel,documentId));
1115	1117	if(StringUtils.isNotEmpty(result9)){
1116	1118	List<UploadResult> list9=JsonUtil.jsonToList(result9, UploadResult.class);
...	...	@@ -1131,7 +1133,7 @@
1131	1133	Update update9 = new Update().set("isUploadingYn.gravidityEndingTab", 0);//失败
1132	1134	mongoTemplate.updateFirst(baseQuery9, update9, PreEugenicsBaseModel.class);
1133	1135	LogUtil.taskError("上传异常：result9=HttpClientUtil.doWebServicePost",null);
1134		- }
	1136	+ }*/
1135	1137
1136	1138	}else {
1137	1139	Query baseQuery1 = Query.query(Criteria.where("id").is(preEugenicsBaseModel.getId()));

...	...	@@ -2,12 +2,19 @@
2	2
3	3	import com.lyms.hospitalapi.lhxfy.model.Archives;
4	4	import com.lyms.hospitalapi.lhxfy.model.UploadResult;
	5	+import com.lyms.hospitalapi.lhxfy.model.enums.CardTypeEnums;
	6	+import com.lyms.hospitalapi.lhxfy.model.enums.CareerEnums;
	7	+import com.lyms.hospitalapi.lhxfy.model.enums.EducationalEnums;
	8	+import com.lyms.hospitalapi.lhxfy.model.enums.NationEnums;
5	9	import com.lyms.platform.common.utils.DateUtil;
6	10	import com.lyms.platform.common.utils.JsonUtil;
7	11	import com.lyms.platform.common.utils.StringUtils;
8	12	import com.lyms.platform.common.utils.SystemConfig;
	13	+import com.lyms.platform.operate.web.facade.AutoMatchFacade;
9	14	import com.lyms.platform.operate.web.facade.BasicConfigFacade;
10	15	import com.lyms.platform.operate.web.result.BasicConfigResult;
	16	+import com.lyms.platform.permission.model.Organization;
	17	+import com.lyms.platform.permission.service.OrganizationService;
11	18	import com.lyms.platform.pojo.PreEugenicsBaseModel;
12	19	import org.springframework.beans.factory.annotation.Autowired;
13	20	import org.springframework.stereotype.Component;
...	...	@@ -24,6 +31,12 @@
24	31	public class LhxfyUploadingProvince {
25	32	@Autowired
26	33	private BasicConfigFacade basicConfigFacade;
	34	+ @Autowired
	35	+ private AutoMatchFacade autoMatchFacade;
	36	+ @Autowired
	37	+ private OrganizationService organizationService;
	38	+ @Autowired
	39	+ private LhxfyService lhxfyService;
27	40
28	41	//上传孕前档案基本信息4.1
29	42	public String uploadingProvinceArchives(PreEugenicsBaseModel baseModel,String key){
30	43
31	44
32	45
33	46
34	47
35	48
36	49
37	50
38	51
...	...	@@ -31,58 +44,130 @@
31	44	archives.setKey(key);// 上传需要的密钥
32	45	archives.setDocName(baseModel.getDoctor());// 医师签名
33	46	archives.setFillTime(DateUtil.getyyyy_MM_dd(baseModel.getFillDate()));// 填写日期
34		- archives.setIsCharge(null);// 收费类型 01 免费 02 收费
35		- archives.setCountyName(null);// 县级服务机构名称
36		- archives.setVillageName(null);// 乡级服务机构名称
	47	+ archives.setIsCharge("01");// 收费类型 01 免费 02 收费
	48	+ //医院名称
	49	+ Organization org = organizationService.getOrganization(Integer.valueOf(baseModel.getHospitalId()));
	50	+ archives.setCountyName(StringUtils.isNotEmpty(org.getName())?org.getName():"");// 县级服务机构名称
	51	+ archives.setVillageName("计划生育服务站");// 乡级服务机构名称（计划生育服务站）写死
37	52	archives.setWifeName(baseModel.getWifeName());// 妻子姓名
38	53	archives.setWife_idCard(baseModel.getWifeCardNo());// 妻子身份证号
39	54	archives.setWifeAge(baseModel.getWifeAge());// 妻子年龄
40	55	archives.setWifeBirth(DateUtil.getyyyy_MM_dd(baseModel.getWifeBirthday()));// 妻子出生时间
	56	+ //民族
	57	+ String wifeNationCode=null;
41	58	List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
42	59	for (BasicConfigResult nationResult : nationResults) {
	60	+ if(baseModel.getWifeNation().equals(nationResult.getId())){
	61	+ wifeNationCode=nationResult.getName();
	62	+ }
	63	+ }
	64	+ archives.setWifeNationCode(NationEnums.getId(wifeNationCode));// 妻子民族编码（具体
	65	+ // 妻子文化程度
	66	+ String wifeEducational=null;
	67	+ List<BasicConfigResult> levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
	68	+ for (BasicConfigResult educational : levelType) {
	69	+ if(baseModel.getWifeEducational().equals(educational.getId())){
	70	+ wifeEducational=educational.getName();
	71	+ }
	72	+ }
	73	+ archives.setWifeCultureCode(EducationalEnums.getId(wifeEducational));// 妻子文化程度01：
43	74
	75	+ archives.setWifeRegisteredCode(baseModel.getWifeAccountNature().equals("1")?"01":"02");// 妻子户口性质 01 农业户口 02 非农业户口
	76	+ //职业
	77	+ String wifeCareer=null;
	78	+ List<BasicConfigResult> professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
	79	+ for (BasicConfigResult professionTypeResult : professionTypeResults) {
	80	+ if(baseModel.getWifeCareer().equals(professionTypeResult.getId())){
	81	+ wifeCareer=professionTypeResult.getName();
	82	+ }
44	83	}
45		- archives.setWifeNationCode(null);// 妻子民族编码（具体
46		- archives.setWifeCultureCode(null);// 妻子文化程度01：
47		- archives.setWifeRegisteredCode(null);// 妻子户口性();
48		- archives.setWifeOccupationCode(null);// 妻子职业（();
49		- archives.setMotherLandline(null);// 座机号
	84	+ archives.setWifeOccupationCode(StringUtils.isNotEmpty(CareerEnums.getId(wifeCareer))?CareerEnums.getId(wifeCareer):"");// 妻子职业
	85	+ archives.setMotherLandline(baseModel.getFixedLineTelephone());// 座机号
50	86	archives.setMotherEmail(null);// 邮箱
51	87	archives.setMotherQQ(null);// QQ
52	88	archives.setMotherWechat(null);// 妻子微信
53		- archives.setWifeOccupationCodeContent(null);//
54		- archives.setWifeTelephone(null);// 妻子联系电话
55		- archives.setWifeCertificatesCode(null);// 妻子证件类
56		- archives.setWife_current_village(null);// 妻子现住址
57		- archives.setWife_regist_village(null);// 妻子户口村
58		- archives.setHusbandName(null);// 丈夫姓名
59		- archives.setHusbandTelephone(null);// 丈夫联系电话
60		- archives.setHusbandAge(null);// 丈夫年龄
61		- archives.setHusbandCode(null);// 丈夫邮编
	89	+ archives.setWifeOccupationCodeContent(null);//妻子职业07的其他的时候存入的信息
	90	+ archives.setWifeTelephone(baseModel.getWifePhone());// 妻子联系电话
	91	+ //妻子证件类型
	92	+ String wifeCardType=null;
	93	+ List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
	94	+ for (BasicConfigResult basicConfigResult : pcerteTypeResult) {
	95	+ if(baseModel.getWifeCardType().equals(basicConfigResult.getId())){
	96	+ wifeCardType=basicConfigResult.getName();
	97	+ }
	98	+ }
	99	+ archives.setWifeCertificatesCode(CardTypeEnums.getId(wifeCardType));// 妻子证件类(传空的话默认01)
	100	+ //妻子现住址村级区划（只传街道id）
	101	+ archives.setWife_current_village(lhxfyService.getPreeugenicsAddr(baseModel.getWifeCurrentStreet()));
	102	+ //妻子户口村级区划（只传街道id）
	103	+ archives.setWife_regist_village(lhxfyService.getPreeugenicsAddr(baseModel.getWifeCurrentStreet()));
	104	+ archives.setHusbandName(baseModel.getHusbandName());// 丈夫姓名
	105	+ archives.setHusbandTelephone(baseModel.getHusbandPhone());// 丈夫联系电话
	106	+ archives.setHusbandAge(baseModel.getHusbandAge());// 丈夫年龄
	107	+ archives.setHusbandCode(StringUtils.isNotEmpty(baseModel.getHusbandZipCode())?baseModel.getHusbandZipCode():"000000");// 丈夫邮编
62	108	archives.setFatherEmail(null);// 邮箱
63	109	archives.setFatherQQ(null);// QQ
64	110	archives.setFatherWechat(null);// 丈夫微信
65		- archives.setHusband_idCard(null);// 丈夫身份证号
66		- archives.setHusbandBirth(null);// 丈夫出生时间
67		- archives.setHusbandNationCode(null);// 丈夫民族编
68		- archives.setHusbandCultureCode(null);// 丈夫文化程
69		- archives.setHusbandRegisteredCode(null);//
70		- archives.setHusbandOccupationCode(null);//
71		- archives.setHusbandOccupationCodeContent(null);
72		- archives.setHusbandCertificatesCode(null);// 丈
73		- archives.setHusband_village(null);// 丈夫户口村级区划
74		- archives.setZipCode(null);// 妻子邮编
75		- archives.setMarriageTime(null);// 结婚时间
76		- archives.setSubUnitsVillage(null);// 隶属单位村级区划
77		- archives.setMarriageTypeCode(null);// 婚姻状态01：初婚
	111	+ archives.setHusband_idCard(baseModel.getHusbandCardNo());// 丈夫身份证号
	112	+ archives.setHusbandBirth(DateUtil.getyyyy_MM_dd(baseModel.getHusbandBirthday()));// 丈夫出生时间
	113	+ //民族
	114	+ String husbandNation=null;
	115	+ List<BasicConfigResult> nationResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
	116	+ for (BasicConfigResult nationResult : nationResults2) {
	117	+ if(baseModel.getHusbandNation().equals(nationResult.getId())){
	118	+ husbandNation=nationResult.getName();
	119	+ }
	120	+ }
	121	+ archives.setHusbandNationCode(NationEnums.getId(wifeNationCode));// 丈夫民族编码
	122	+ // 丈夫文化程度
	123	+ String husbandEducational=null;
	124	+ List<BasicConfigResult> levelType2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
	125	+ for (BasicConfigResult educational : levelType2) {
	126	+ if(baseModel.getHusbandEducational().equals(educational.getId())){
	127	+ husbandEducational=educational.getName();
	128	+ }
	129	+ }
	130	+ archives.setHusbandCultureCode(EducationalEnums.getId(husbandEducational));// 丈夫文化程
	131	+ archives.setHusbandRegisteredCode(baseModel.getHusbandAccountNature().equals("1")?"01":"02");// 丈夫户口性质01 农业户口 02 非农业户口
	132	+ //丈夫职业
	133	+ String husbandCareer=null;
	134	+ List<BasicConfigResult> professionTypeResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
	135	+ for (BasicConfigResult professionTypeResult : professionTypeResults2) {
	136	+ if(baseModel.getHusbandCareer().equals(professionTypeResult.getId())){
	137	+ husbandCareer=professionTypeResult.getName();
	138	+ }
	139	+ }
	140	+ archives.setHusbandOccupationCode(StringUtils.isNotEmpty(CareerEnums.getId(husbandCareer))?CareerEnums.getId(husbandCareer):"");// 丈夫职业
	141	+ archives.setHusbandOccupationCodeContent(null);//丈夫职业07的时候需要存入信息
	142	+ //丈夫证件类型(传空的话默认01)01:居民身份证02:护照 03: 港澳居民身份证04:军官证 05: 其他有效证件
	143	+ archives.setHusbandCertificatesCode(CardTypeEnums.getId(baseModel.getHusbandCardType()));
	144	+
	145	+ archives.setHusband_village(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandCurrentStreet()));// 丈夫户口村级区划
	146	+ archives.setZipCode(StringUtils.isNotEmpty(baseModel.getWifeZipCode())?baseModel.getWifeZipCode():"000000");// 妻子邮编
	147	+ archives.setMarriageTime(DateUtil.getyyyy_MM_dd(baseModel.getMarriageTime()));// 结婚时间
	148	+ //隶属单位村级区划（应是隶属单位下的区划）如果是隆化妇幼保健院写死130825100227
	149	+ archives.setSubUnitsVillage(baseModel.getSubUnitsVillage());
	150	+ archives.setMarriageTypeCode(null);// 婚姻状态01：初婚 02：再婚 03：复婚
78	151	archives.setFloatingCode(null);// 是否流动人口 1 是 2
79		- archives.setPeriMarriageEducation(null);// 优
80		- archives.setIsPection(null);// 是否同步到婚检 1是 0
	152	+ archives.setPeriMarriageEducation("01");// 优生健康教育下拉选 01双方接受教育 02 男方接受教育 03 女方接受教育（系统没有字段必填默认01）
	153	+ archives.setIsPection(null);// 是否同步到婚检 1是 0否
81	154	archives.setHusbandWorkUnit(null);// 丈夫工作单位
82		- archives.setHusbandResidentialCategory(null);//
	155	+ archives.setHusbandResidentialCategory("01");//丈夫居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01）
83	156	archives.setWifeWorkUnit(null);// 妻子工作单位
84		- archives.setWifeResidentialCategory(null);// 妻
85		- archives.setHusbandAddressVillage(null);// 丈
	157	+ archives.setWifeResidentialCategory("01");//妻子居住类 01 本地 02 非本地居住一年以 03 非本地居住一年以上（系统没有字段必填默认01）
	158	+ archives.setHusbandAddressVillage(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandCurrentStreet()));// 丈夫现住址村级区划（只传街道id）
	159	+ switch (baseModel.getHasSignBook()){
	160	+ case "1":
	161	+ baseModel.setHasSignBook("01");
	162	+ break;
	163	+ case "2":
	164	+ baseModel.setHasSignBook("02");
	165	+ break;
	166	+ case "3":
	167	+ baseModel.setHasSignBook("03");
	168	+ break;
	169	+ }
	170	+ archives.setInformedConsent(baseModel.getHasSignBook());// 知情同意书签署情况 01男方签署 02 女方签署 03 双方签署
86	171	return JsonUtil.obj2Str(archives);
87	172	}
88	173	//上传孕前一般情况4.3

	1	+package com.lyms.hospitalapi.lhxfy.model.enums;
	2	+
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
	5	+/**
	6	+ * 4.11附表
	7	+ * 民族
	8	+ */
	9	+public enum CardTypeEnums {
	10	+ Nation01("01", "身份证/居民身份证"),
	11	+ Nation02("02", "护照"),
	12	+ Nation03("03", "港澳居民身份证"),
	13	+ Nation04("04", "军官证"),
	14	+ Nation05("05", "其他有效证件/士官证/手机号/二维码");
	15	+
	16	+
	17	+ CardTypeEnums(String id, String name) {
	18	+ this.id = id;
	19	+ this.name = name;
	20	+ }
	21	+
	22	+
	23	+ public static String getName(String id) {
	24	+ if(StringUtils.isEmpty(id)) return "";
	25	+ CardTypeEnums[] values = CardTypeEnums.values();
	26	+ for (CardTypeEnums value : values) {
	27	+ if (value.getId().equals(id)) {
	28	+ return value.getName();
	29	+ }
	30	+ }
	31	+ return "";
	32	+ }
	33	+ public static String getId(String name) {
	34	+ if(StringUtils.isEmpty(name)) return "01";//(传空的话默认01)
	35	+ CardTypeEnums[] values = CardTypeEnums.values();
	36	+ for (CardTypeEnums value : values) {
	37	+ if (value.getName().contains(name)) {
	38	+ return value.getId();
	39	+ }
	40	+ }
	41	+ return "";
	42	+ }
	43	+ private String id;
	44	+ private String name;
	45	+
	46	+ public String getId() {
	47	+ return id;
	48	+ }
	49	+
	50	+ public void setId(String id) {
	51	+ this.id = id;
	52	+ }
	53	+
	54	+ public String getName() {
	55	+ return name;
	56	+ }
	57	+
	58	+ public void setName(String name) {
	59	+ this.name = name;
	60	+ }
	61	+
	62	+}

1	1	package com.lyms.hospitalapi.lhxfy.model.enums;
2	2
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
3	5	/**
4	6	* 4.11附表
5	7	* 职业
...	...	@@ -20,6 +22,7 @@
20	22
21	23
22	24	public static String getName(String id) {
	25	+ if(StringUtils.isEmpty(id)) return "";
23	26	CareerEnums[] values = CareerEnums.values();
24	27	for (CareerEnums value : values) {
25	28	if (value.getId().equals(id)) {
26	29
...	...	@@ -29,9 +32,10 @@
29	32	return "";
30	33	}
31	34	public static String getId(String name) {
	35	+ if(StringUtils.isEmpty(name)) return "";
32	36	CareerEnums[] values = CareerEnums.values();
33	37	for (CareerEnums value : values) {
34		- if (value.getName().equals(name)) {
	38	+ if (value.getName().contains(name)) {
35	39	return value.getId();
36	40	}
37	41	}

1	1	package com.lyms.hospitalapi.lhxfy.model.enums;
2	2
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
3	5	/**
4	6	* 4.11附表
5	7	* 出生缺陷儿--病种类型
...	...	@@ -48,6 +50,7 @@
48	50
49	51
50	52	public static String getName(String id) {
	53	+ if(StringUtils.isEmpty(id)) return "";
51	54	DiseaseEnums[] values = DiseaseEnums.values();
52	55	for (DiseaseEnums value : values) {
53	56	if (value.getId().equals(id)) {
54	57
...	...	@@ -57,9 +60,10 @@
57	60	return "";
58	61	}
59	62	public static String getId(String name) {
	63	+ if(StringUtils.isEmpty(name)) return "";
60	64	DiseaseEnums[] values = DiseaseEnums.values();
61	65	for (DiseaseEnums value : values) {
62		- if (value.getName().equals(name)) {
	66	+ if (value.getName().contains(name)) {
63	67	return value.getId();
64	68	}
65	69	}

	1	+package com.lyms.hospitalapi.lhxfy.model.enums;
	2	+
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
	5	+public enum EducationalEnums {
	6	+ Educational01("01", "文盲/文盲与半文盲"),
	7	+ Educational02("02", "小学"),
	8	+ Educational03("03", "初中"),
	9	+ Educational04("04", "高中/中专/中技/中专和中技/技工学校"),
	10	+ Educational05("05", "大专/大本/本科"),
	11	+ Educational06("06", "硕士研究生/博士研究生/博士后/博士/硕士");
	12	+
	13	+ EducationalEnums(String id, String name) {
	14	+ this.id = id;
	15	+ this.name = name;
	16	+ }
	17	+
	18	+
	19	+ public static String getName(String id) {
	20	+ EducationalEnums[] values = EducationalEnums.values();
	21	+ for (EducationalEnums value : values) {
	22	+ if (value.getId().equals(id)) {
	23	+ return value.getName();
	24	+ }
	25	+ }
	26	+ return "";
	27	+ }
	28	+ public static String getId(String name) {
	29	+ if(StringUtils.isEmpty(name)) return "";
	30	+ EducationalEnums[] values = EducationalEnums.values();
	31	+ for (EducationalEnums value : values) {
	32	+ if (value.getName().contains(name)) {
	33	+ return value.getId();
	34	+ }
	35	+ }
	36	+ return "";
	37	+ }
	38	+ private String id;
	39	+ private String name;
	40	+
	41	+ public String getId() {
	42	+ return id;
	43	+ }
	44	+
	45	+ public void setId(String id) {
	46	+ this.id = id;
	47	+ }
	48	+
	49	+ public String getName() {
	50	+ return name;
	51	+ }
	52	+
	53	+ public void setName(String name) {
	54	+ this.name = name;
	55	+ }
	56	+
	57	+}

1	1	package com.lyms.hospitalapi.lhxfy.model.enums;
2	2
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
3	5	/**
4	6	* 4.11附表
5	7	* 民族
...	...	@@ -69,6 +71,7 @@
69	71
70	72
71	73	public static String getName(String id) {
	74	+ if(StringUtils.isEmpty(id)) return "";
72	75	NationEnums[] values = NationEnums.values();
73	76	for (NationEnums value : values) {
74	77	if (value.getId().equals(id)) {
75	78
...	...	@@ -78,9 +81,10 @@
78	81	return "";
79	82	}
80	83	public static String getId(String name) {
	84	+ if(StringUtils.isEmpty(name)) return "";
81	85	NationEnums[] values = NationEnums.values();
82	86	for (NationEnums value : values) {
83		- if (value.getName().equals(name)) {
	87	+ if (value.getName().contains(name)) {
84	88	return value.getId();
85	89	}
86	90	}