From b43d2d503dcf64bd54da137423cc620de5096dc1 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 9 Dec 2021 21:53:33 +0800 Subject: [PATCH] update --- .../hospitalapi/lhxfy/LhxfyUploadingProvince.java | 59 ++++++++++++++++------ 1 file changed, 44 insertions(+), 15 deletions(-) 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 75b0614..35e82ec 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 @@ -83,8 +83,14 @@ public class LhxfyUploadingProvince { } } archives.setWifeCultureCode(EducationalEnums.getId(wifeEducational));// 妻子文化程度01： - - archives.setWifeRegisteredCode(baseModel.getWifeAccountNature().equals("1")?"01":"02");// 妻子户口性质 01 农业户口 02 非农业户口 + String wifeRegisteredCode=""; + List censusType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID); + for (BasicConfigResult educational : censusType) { + if(StringUtils.isNotEmpty(baseModel.getWifeAccountNature())&&baseModel.getWifeAccountNature().equals(educational.getId())){ + wifeRegisteredCode=educational.getName(); + } + } + archives.setWifeRegisteredCode(StringUtils.isNotEmpty(wifeRegisteredCode)?wifeRegisteredCode.equals("农业户口")?"01":"02":"02");//如果系统没有匹配到默认非农业户口 //职业 String wifeCareer=""; List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); @@ -140,7 +146,15 @@ public class LhxfyUploadingProvince { } } archives.setHusbandCultureCode(EducationalEnums.getId(husbandEducational));// 丈夫文化程 - archives.setHusbandRegisteredCode(baseModel.getHusbandAccountNature().equals("1")?"01":"02");// 丈夫户口性质01 农业户口 02 非农业户口 + // 丈夫户口性质01 农业户口 02 非农业户口 + String husbandRegisteredCode=""; + List censusType2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID); + for (BasicConfigResult educational : censusType2) { + if(StringUtils.isNotEmpty(baseModel.getHusbandAccountNature())&&baseModel.getHusbandAccountNature().equals(educational.getId())){ + husbandRegisteredCode=educational.getName(); + } + } + archives.setHusbandRegisteredCode(StringUtils.isNotEmpty(husbandRegisteredCode)?husbandRegisteredCode.equals("农业户口")?"01":"02":"02");//如果系统没有匹配到默认非农业户口 //丈夫职业 String husbandCareer=""; List professionTypeResults2 = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); @@ -170,17 +184,17 @@ public class LhxfyUploadingProvince { archives.setHusbandAddressVillage(lhxfyService.getPreeugenicsAddr(baseModel.getHusbandCurrentStreet()));// 丈夫现住址村级区划（只传街道id） switch (baseModel.getHasSignBook()){ case "1": - baseModel.setHasSignBook("01"); + baseModel.setHasSignBook("02"); break; case "2": - baseModel.setHasSignBook("02"); + baseModel.setHasSignBook("01"); break; case "3": baseModel.setHasSignBook("03"); break; } // 知情同意书签署情况 01男方签署 02 女方签署 03 双方签署(系统1女，2男，双方3) - archives.setInformedConsent(baseModel.getHasSignBook().toString().equals("1")?"02":baseModel.getHasSignBook().toString().equals("2")?"01":"03"); + archives.setInformedConsent(baseModel.getHasSignBook()); Map mapjson=JSON.parseObject(JSON.toJSONString(archives),Map.class);//转换map去掉NULL同时也去掉id对象。新增不能有id对象 return JsonUtil.obj2Str(mapjson); } @@ -349,8 +363,8 @@ public class LhxfyUploadingProvince { general.setLastMenstrual(null!=baseInfo.get("lastMenses")?baseInfo.get("lastMenses").toString():""); // 末次月经 if(CollectionUtils.isNotEmpty((List)baseInfo.get("menstrualCycle"))){ List menstrualCycle=(List)baseInfo.get("menstrualCycle"); - general.setMenstrualNothing(menstrualCycle.get(0).toString().equals("true")?"1":"2"); // 月经周期不规律1：是 2：否 general.setMenstrualYes(menstrualCycle.get(0).toString().equals("true")?"1":"2"); // 月经周期规律1：是 2：否 + general.setMenstrualNothing(menstrualCycle.get(0).toString().equals("true")?"2":"1"); // 月经周期不规律1：是 2：否 } general.setMenstrualMany(null!=baseInfo.get("menstrualAmount")?baseInfo.get("menstrualAmount").toString().equals("1")?"1":"2":""); // 月经量多 1：是 2：否 general.setMenstrualMiddle(null!=baseInfo.get("menstrualAmount")?baseInfo.get("menstrualAmount").toString().equals("2")?"1":"2":""); // 月经量中 1：是 2：否 @@ -551,15 +565,30 @@ public class LhxfyUploadingProvince { general.setVaccineNothing(zsym.get(i).toString().equals("true")?"2":"1"); // 没有注射过疫苗1： 是（没有注射过）2：否（注射过） break; case 1: - general.setRubellaVaccine(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-风疹疫苗1：是 2：否 + if("01".equals(baseInfo.get("sex").toString())){//因为存储顺序问题，这里错位男性下标1是乙肝 + general.setHepatitisBVaccine(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-乙肝疫苗1：是 2：否 + }else { + general.setRubellaVaccine(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-风疹疫苗1：是 2：否 + } break; case 2: - general.setHepatitisBVaccine(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-乙肝疫苗1：是 2：否 + if("01".equals(baseInfo.get("sex").toString())) {//因为存储顺序问题，这里错位男性下标2是其他 + general.setVaccineOther(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-其他1：是 2：否 + }else { + general.setHepatitisBVaccine(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-乙肝疫苗1：是 2：否 + } break; case 3: - general.setVaccineOther(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-其他1：是 2：否 + if("01".equals(baseInfo.get("sex").toString())) {//因为存储顺序问题，这里错位男性下标3是其他疫苗 + general.setVaccineContent(zsym.get(i).toString()); // 其他疫苗 + }else { + general.setVaccineOther(zsym.get(i).toString().equals("true")?"1":"2"); // 疫苗注射-其他1：是 2：否 + } break; case 4: + if("01".equals(baseInfo.get("sex").toString())) {//因为存储顺序问题，这里错位男性没有下标4 + break; + } general.setVaccineContent(zsym.get(i).toString()); // 其他疫苗 break; } @@ -914,11 +943,11 @@ public class LhxfyUploadingProvince { physiqueCheck.setLowBloodPressure(baseInfo.get("ssy").toString());// 血压（低） physiqueCheck.setMentalStateType(((List)baseInfo.get("jszt")).get(0).toString().equals("0")?"01":"02");// 精神状态类型01：正常 02：异 physiqueCheck.setMentalState(((List)baseInfo.get("jszt")).get(1).toString());// 精神状态异常详情 - physiqueCheck.setIntelligenceType(((List)baseInfo.get("zl")).get(0).toString().equals("false")?"01":"02");// 智力类型 01：正常 02：异常 - physiqueCheck.setIntelligenceType1(((List)baseInfo.get("zlyc")).get(0).toString().equals("true")?"01":null);// 智力异常--常识 1：选中 - physiqueCheck.setIntelligenceType2(((List)baseInfo.get("zlyc")).get(1).toString().equals("true")?"01":null);// 智力异常--判断 1：选中 - physiqueCheck.setIntelligenceType3(((List)baseInfo.get("zlyc")).get(2).toString().equals("true")?"01":null);// 智力异常--记忆 1：选中 - physiqueCheck.setIntelligenceType4(((List)baseInfo.get("zlyc")).get(3).toString().equals("true")?"01":null);// 智力异常--计算 1：选中 + physiqueCheck.setIntelligenceType(((List)baseInfo.get("zl")).get(0).toString().equals("0")?"01":"02");// 智力类型 01：正常 02：异常 + physiqueCheck.setIntelligenceType1(((List)baseInfo.get("zlyc")).get(0).toString().equals("true")?"1":null);// 智力异常--常识 1：选中 + physiqueCheck.setIntelligenceType2(((List)baseInfo.get("zlyc")).get(1).toString().equals("true")?"1":null);// 智力异常--判断 1：选中 + physiqueCheck.setIntelligenceType3(((List)baseInfo.get("zlyc")).get(2).toString().equals("true")?"1":null);// 智力异常--记忆 1：选中 + physiqueCheck.setIntelligenceType4(((List)baseInfo.get("zlyc")).get(3).toString().equals("true")?"1":null);// 智力异常--计算 1：选中 physiqueCheck.setFacialFeatureType(((List)baseInfo.get("wuguan")).get(0).toString().equals("0")?"01":"02");// 五官 01：正常 02：异常 physiqueCheck.setFacialFeature(((List)baseInfo.get("wuguan")).get(1).toString());// 五官异常详情 physiqueCheck.setSpecialPostureType(((List)baseInfo.get("tstt")).get(0).toString().equals("0")?"01":"02");// 特殊体态类型 01：无 0 -- 1.8.3.1