From 977749549e9db3e031cd812738bb0894af52cd99 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 16 Oct 2018 18:27:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 28 +- .../operate/web/worker/MaterDeliverWorker.java | 661 +++++++++++---------- 2 files changed, 350 insertions(+), 339 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index adc7248..5a1efb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1680,17 +1680,17 @@ public class MatDeliverFacade { } if (matdeliverFollowRequest.getStartDay() != null && matdeliverFollowRequest.getEndDay() != null ) { - matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()-1))); + matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()))); matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()+1))); } else if (matdeliverFollowRequest.getStartDay() != null) { - matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()-1))); + matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()))); matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()+1))); } else if(matdeliverFollowRequest.getEndDay() != null) { - matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()-1))); + matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()))); matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()+1))); } @@ -1905,7 +1905,8 @@ public class MatDeliverFacade { } } } - if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null && StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode())) {//导出excel和根据出血量查询 + if (!childbirthManagerRequest.isExcel() && childbirthManagerRequest.getHloseBloodType() == null + && StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) && childbirthManagerRequest.getWeight() == null) {//导出excel和根据出血量查询 patientsQuery.setLimit(childbirthManagerRequest.getLimit()); patientsQuery.setPage(childbirthManagerRequest.getPage()); patientsQuery.setNeed("need"); @@ -1924,8 +1925,6 @@ public class MatDeliverFacade { patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo()); patientsQuery.setFmHospitalQueryList(hospitalList); - // String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); - // patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson); patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge())); patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge())); patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()) * 7); @@ -1933,8 +1932,9 @@ public class MatDeliverFacade { // 分娩方式去另外一张表查 patientsQuery.setDesc("fmDate"); patientsQuery.setSort("fmDate"); - // System.out.println("分娩查询：" + patientsQuery.convertToQuery().convertToMongoQuery()); List patientsList = patientsService.queryPatient(patientsQuery); + + // 这里就设置分页内容 childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo()); List parentIdList = new ArrayList<>(); @@ -1949,7 +1949,7 @@ public class MatDeliverFacade { } MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); - + matDeliverQuery.setParentIdList(parentIdList); matDeliverQuery.setYn(YnEnums.YES.getId()); matDeliverQuery.setHloseBloodType(childbirthManagerRequest.getHloseBloodType()); String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); @@ -1962,15 +1962,12 @@ public class MatDeliverFacade { matDeliverQuery.setLimit(childbirthManagerRequest.getLimit()); matDeliverQuery.setPage(childbirthManagerRequest.getPage()); matDeliverQuery.setNeed("need"); - // System.out.println("分娩查询条件：" + matDeliverQuery.convertToQuery().convertToMongoQuery()); maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); // 这里就设置分页内容 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); } else {//否则按常规查询 - // System.out.println("分娩查询条件："+matDeliverQuery.convertToQuery().convertToMongoQuery()); maternalDeliverModelList = matDeliverService.query(matDeliverQuery); } - // System.out.println("分娩表查询："+matDeliverQuery.convertToQuery().convertToMongoQuery()); Map patientsMap = new HashedMap(); @@ -1992,15 +1989,20 @@ public class MatDeliverFacade { babyService, basicConfigService, childbirthManagerRequest.getInitQuery(), mlist, patientsMap); Future f = commonThreadPool.submit(c); - futures.add(f); + if (f != null) + { + futures.add(f); + } + } if (CollectionUtils.isNotEmpty(futures)) { for (Future f : futures) { try { + childbirthManagerQueryModelList.addAll((List) f.get()); } catch (Exception e) { - ExceptionUtils.catchException(e, "getCourseCount list error."); + ExceptionUtils.catchException(e, "fm list error."); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index b2f8ac7..3a9ca54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -59,406 +59,415 @@ public class MaterDeliverWorker implements Callable call() { List childbirthManagerQueryModelList = new ArrayList<>(); - for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { - Patients patients = patientsMap.get(maternalDeliverModel.getParentId()); - // 开始封装数据 - ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel(); - if (maternalDeliverModel != null) { - BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel); - } - BeanUtils.copy(patients, childbirthManagerQueryModel); - // 分娩孕周 - String week = (patients.getFmWeek() / 7) + ""; - int day = (patients.getFmWeek() % 7); - childbirthManagerQueryModel.setDueWeek("孕" + week + "周" + (day > 0 ? "+" + day + "天" : "")); - // 分娩日期 - childbirthManagerQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getFmDate())); - // name - childbirthManagerQueryModel.setName(patients.getUsername()); - // 各种id - childbirthManagerQueryModel.setPid(patients.getPid()); - childbirthManagerQueryModel.setPatientId(patients.getId()); - // 居住地 - if (initQuery.contains("address")) { - childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); - } - // 电话转换 - childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); - childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone())); - // 加密身份证号 - childbirthManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); - // 年龄 - childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth())); + try { + for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) { + Patients patients = patientsMap.get(maternalDeliverModel.getParentId()); + if (patients == null) + { + continue; + } + // 开始封装数据 + ChildbirthManagerQueryModel childbirthManagerQueryModel = new ChildbirthManagerQueryModel(); + if (maternalDeliverModel != null) { + BeanUtils.copy(maternalDeliverModel, childbirthManagerQueryModel); + } + BeanUtils.copy(patients, childbirthManagerQueryModel); + // 分娩孕周 + String week = (patients.getFmWeek() / 7) + ""; + int day = (patients.getFmWeek() % 7); + childbirthManagerQueryModel.setDueWeek("孕" + week + "周" + (day > 0 ? "+" + day + "天" : "")); + // 分娩日期 + childbirthManagerQueryModel.setDueDate(DateUtil.getyyyy_MM_dd(patients.getFmDate())); + // name + childbirthManagerQueryModel.setName(patients.getUsername()); + // 各种id + childbirthManagerQueryModel.setPid(patients.getPid()); + childbirthManagerQueryModel.setPatientId(patients.getId()); + // 居住地 + if (initQuery.contains("address")) { + childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + } + // 电话转换 + childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); + childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone())); + // 加密身份证号 + childbirthManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); + // 年龄 + childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth())); - // 居住类型 - if (initQuery.contains("pliveTypeId")) { - try { - if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getPliveTypeId())) { - childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById(patients.getPliveTypeId()).getName()); + // 居住类型 + if (initQuery.contains("pliveTypeId")) { + try { + if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getPliveTypeId())) { + childbirthManagerQueryModel.setPliveTypeId(basicConfigService.getOneBasicConfigById(patients.getPliveTypeId()).getName()); + } + } catch (Exception e) { + // 什么都不干 } - } catch (Exception e) { - // 什么都不干 } - } - // 户口类型 - if (initQuery.contains("pcensusTypeId")) { - try { - if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getPcensusTypeId())) { - childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById(patients.getPcensusTypeId()).getName()); + // 户口类型 + if (initQuery.contains("pcensusTypeId")) { + try { + if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getPcensusTypeId())) { + childbirthManagerQueryModel.setPcensusTypeId(basicConfigService.getOneBasicConfigById(patients.getPcensusTypeId()).getName()); + } + } catch (Exception e) { + // 什么都不干 } - } catch (Exception e) { - // 什么都不干 } - } - // 查询活产数 - // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形 - if (initQuery.contains("livingNumber") || initQuery.contains("pregnancyOut") - || initQuery.contains("sex") || initQuery.contains("babyWeight") - || initQuery.contains("babyHeight") || initQuery.contains("apgarScorePf1") || - initQuery.contains("apgarScorePf5") || initQuery.contains("apgarScorePf10") || - initQuery.contains("asphyxiaM") || initQuery.contains("babyHealthy") || - initQuery.contains("malformation")) { - BabyModelQuery babyModelQuery = new BabyModelQuery(); - // babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setParentId(patients.getId()); - babyModelQuery.setDataStatus(false); - babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); - //System.out.println("查询调价n:"+babyModelQuery.convertToQuery().convertToMongoQuery()); - List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); - if (CollectionUtils.isNotEmpty(babyModelList)) { - childbirthManagerQueryModel.setLivingNumber(babyModelList.size()); - } else { - if (childbirthManagerQueryModel.getTireNumber() == null) { - childbirthManagerQueryModel.setLivingNumber(null); + // 查询活产数 + // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形 + if (initQuery.contains("livingNumber") || initQuery.contains("pregnancyOut") + || initQuery.contains("sex") || initQuery.contains("babyWeight") + || initQuery.contains("babyHeight") || initQuery.contains("apgarScorePf1") || + initQuery.contains("apgarScorePf5") || initQuery.contains("apgarScorePf10") || + initQuery.contains("asphyxiaM") || initQuery.contains("babyHealthy") || + initQuery.contains("malformation")) { + BabyModelQuery babyModelQuery = new BabyModelQuery(); + // babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setParentId(patients.getId()); + babyModelQuery.setDataStatus(false); + babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); + //System.out.println("查询调价n:"+babyModelQuery.convertToQuery().convertToMongoQuery()); + List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); + if (CollectionUtils.isNotEmpty(babyModelList)) { + childbirthManagerQueryModel.setLivingNumber(babyModelList.size()); } else { - childbirthManagerQueryModel.setLivingNumber(0); + if (childbirthManagerQueryModel.getTireNumber() == null) { + childbirthManagerQueryModel.setLivingNumber(null); + } else { + childbirthManagerQueryModel.setLivingNumber(0); + } } - } - if (CollectionUtils.isNotEmpty(babyModelList)) { - String pregnancyOut = ""; - String sex = ""; - String babyWeight = ""; - String babyHeight = ""; - String apgarScorePf1 = ""; - String apgarScorePf5 = ""; - String apgarScorePf10 = ""; - String asphyxiaM = ""; - String babyHealthy = ""; - String malformation = ""; - try { - for (BabyModel babyModel : babyModelList) { - if (initQuery.contains("pregnancyOut")) { - for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) { - if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) { - pregnancyOut += renShenJieJuEnums.getName() + ","; - break; - } - if (org.apache.commons.lang.StringUtils.isEmpty(pregnancyOut)) { - pregnancyOut += "-,"; + if (CollectionUtils.isNotEmpty(babyModelList)) { + String pregnancyOut = ""; + String sex = ""; + String babyWeight = ""; + String babyHeight = ""; + String apgarScorePf1 = ""; + String apgarScorePf5 = ""; + String apgarScorePf10 = ""; + String asphyxiaM = ""; + String babyHealthy = ""; + String malformation = ""; + try { + for (BabyModel babyModel : babyModelList) { + if (initQuery.contains("pregnancyOut")) { + for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) { + if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) { + pregnancyOut += renShenJieJuEnums.getName() + ","; + break; + } + if (org.apache.commons.lang.StringUtils.isEmpty(pregnancyOut)) { + pregnancyOut += "-,"; + } } } - } - if (initQuery.contains("sex")) { - for (SexEnum sexEnum : SexEnum.values()) { - if (sexEnum.getId().equals(babyModel.getSex())) { - sex += sexEnum.getText() + ","; - break; - } - if (org.apache.commons.lang.StringUtils.isEmpty(sex)) { - sex += "-,"; + if (initQuery.contains("sex")) { + for (SexEnum sexEnum : SexEnum.values()) { + if (sexEnum.getId().equals(babyModel.getSex())) { + sex += sexEnum.getText() + ","; + break; + } + if (org.apache.commons.lang.StringUtils.isEmpty(sex)) { + sex += "-,"; + } } } + babyWeight += babyModel.getBabyWeight() == null ? "-," : babyModel.getBabyWeight() + ","; + babyHeight += babyModel.getBabyHeight() == null ? "-," : babyModel.getBabyHeight() + ","; + asphyxiaM += babyModel.getAsphyxiaM() == null ? "-," : babyModel.getAsphyxiaM() + ","; + babyHealthy += babyModel.getBabyHealthy() == null ? "-," : babyModel.getBabyHealthy() + ","; + if (Integer.valueOf(0).equals(babyModel.getMalformation())) { + malformation += "非畸形" + ","; + } else if (Integer.valueOf(1).equals(babyModel.getMalformation())) { + malformation += "畸形" + ","; + } else { + malformation += "-,"; + } + Map map = JsonUtil.getMap(babyModel.getApgarScore()); + if (MapUtils.isNotEmpty(map)) { + apgarScorePf1 += map.get("pf1") == null ? "-," : map.get("pf1") + ","; + apgarScorePf5 += map.get("pf5") == null ? "-," : map.get("pf5") + ","; + apgarScorePf10 += map.get("pf10") == null ? "-," : map.get("pf10") + ","; + } } - babyWeight += babyModel.getBabyWeight() == null ? "-," : babyModel.getBabyWeight() + ","; - babyHeight += babyModel.getBabyHeight() == null ? "-," : babyModel.getBabyHeight() + ","; - asphyxiaM += babyModel.getAsphyxiaM() == null ? "-," : babyModel.getAsphyxiaM() + ","; - babyHealthy += babyModel.getBabyHealthy() == null ? "-," : babyModel.getBabyHealthy() + ","; - if (Integer.valueOf(0).equals(babyModel.getMalformation())) { - malformation += "非畸形" + ","; - } else if (Integer.valueOf(1).equals(babyModel.getMalformation())) { - malformation += "畸形" + ","; - } else { - malformation += "-,"; - } - Map map = JsonUtil.getMap(babyModel.getApgarScore()); - if (MapUtils.isNotEmpty(map)) { - apgarScorePf1 += map.get("pf1") == null ? "-," : map.get("pf1") + ","; - apgarScorePf5 += map.get("pf5") == null ? "-," : map.get("pf5") + ","; - apgarScorePf10 += map.get("pf10") == null ? "-," : map.get("pf10") + ","; - } + } catch (Exception e) { + // 什么都不干，这么干是为了避开原始数据的问题 } - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 + childbirthManagerQueryModel.setPregnancyOut(pregnancyOut.length() == 0 ? "" : pregnancyOut.substring(0, pregnancyOut.length() - 1)); + childbirthManagerQueryModel.setSex(sex.length() == 0 ? "" : sex.substring(0, sex.length() - 1)); + childbirthManagerQueryModel.setBabyWeight(babyWeight.length() == 0 ? "" : babyWeight.substring(0, babyWeight.length() - 1)); + childbirthManagerQueryModel.setBabyHeight(babyHeight.length() == 0 ? "" : babyHeight.substring(0, babyHeight.length() - 1)); + childbirthManagerQueryModel.setApgarScorePf1(apgarScorePf1.length() == 0 ? "" : apgarScorePf1.substring(0, apgarScorePf1.length() - 1)); + childbirthManagerQueryModel.setApgarScorePf5(apgarScorePf5.length() == 0 ? "" : apgarScorePf5.substring(0, apgarScorePf5.length() - 1)); + childbirthManagerQueryModel.setApgarScorePf10(apgarScorePf10.length() == 0 ? "" : apgarScorePf10.substring(0, apgarScorePf10.length() - 1)); + childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1)); + childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1)); + childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1)); } - childbirthManagerQueryModel.setPregnancyOut(pregnancyOut.length() == 0 ? "" : pregnancyOut.substring(0, pregnancyOut.length() - 1)); - childbirthManagerQueryModel.setSex(sex.length() == 0 ? "" : sex.substring(0, sex.length() - 1)); - childbirthManagerQueryModel.setBabyWeight(babyWeight.length() == 0 ? "" : babyWeight.substring(0, babyWeight.length() - 1)); - childbirthManagerQueryModel.setBabyHeight(babyHeight.length() == 0 ? "" : babyHeight.substring(0, babyHeight.length() - 1)); - childbirthManagerQueryModel.setApgarScorePf1(apgarScorePf1.length() == 0 ? "" : apgarScorePf1.substring(0, apgarScorePf1.length() - 1)); - childbirthManagerQueryModel.setApgarScorePf5(apgarScorePf5.length() == 0 ? "" : apgarScorePf5.substring(0, apgarScorePf5.length() - 1)); - childbirthManagerQueryModel.setApgarScorePf10(apgarScorePf10.length() == 0 ? "" : apgarScorePf10.substring(0, apgarScorePf10.length() - 1)); - childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1)); - childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1)); - childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1)); } - } - if (maternalDeliverModel != null) { - // 会阴情况 - if (initQuery.contains("perinealCondition")) { - if (org.apache.commons.lang.StringUtils.isNotEmpty(maternalDeliverModel.getPerinealCondition())) { - if ("split".equals(maternalDeliverModel.getPerinealCondition())) { - childbirthManagerQueryModel.setPerinealCondition("切开"); - } else if ("full".equals(maternalDeliverModel.getPerinealCondition())) { - childbirthManagerQueryModel.setPerinealCondition("完整"); - } else { - childbirthManagerQueryModel.setPerinealCondition("-"); + if (maternalDeliverModel != null) { + // 会阴情况 + if (initQuery.contains("perinealCondition")) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(maternalDeliverModel.getPerinealCondition())) { + if ("split".equals(maternalDeliverModel.getPerinealCondition())) { + childbirthManagerQueryModel.setPerinealCondition("切开"); + } else if ("full".equals(maternalDeliverModel.getPerinealCondition())) { + childbirthManagerQueryModel.setPerinealCondition("完整"); + } else { + childbirthManagerQueryModel.setPerinealCondition("-"); + } } } - } - // 失血原因 - if (initQuery.contains("loseBloodCause")) { - String loseBloodCauseJson = maternalDeliverModel.getLoseBloodCause(); - Map loseBloodCauseMap = JsonUtil.getMap(loseBloodCauseJson); - if (MapUtils.isNotEmpty(loseBloodCauseMap) && org.apache.commons.lang.StringUtils.isNotEmpty(loseBloodCauseMap.get("select"))) { - for (SXCauseEnums sxCauseEnums : SXCauseEnums.values()) { - if (sxCauseEnums.getId().equals(loseBloodCauseMap.get("select"))) { - childbirthManagerQueryModel.setLoseBloodCause(sxCauseEnums.getName()); - break; + // 失血原因 + if (initQuery.contains("loseBloodCause")) { + String loseBloodCauseJson = maternalDeliverModel.getLoseBloodCause(); + Map loseBloodCauseMap = JsonUtil.getMap(loseBloodCauseJson); + if (MapUtils.isNotEmpty(loseBloodCauseMap) && org.apache.commons.lang.StringUtils.isNotEmpty(loseBloodCauseMap.get("select"))) { + for (SXCauseEnums sxCauseEnums : SXCauseEnums.values()) { + if (sxCauseEnums.getId().equals(loseBloodCauseMap.get("select"))) { + childbirthManagerQueryModel.setLoseBloodCause(sxCauseEnums.getName()); + break; + } } + if (SXCauseEnums.O5.getName().equals(childbirthManagerQueryModel.getLoseBloodCause()) && org.apache.commons.lang.StringUtils.isNotEmpty(loseBloodCauseMap.get("other"))) { + childbirthManagerQueryModel.setLoseBloodCause(loseBloodCauseMap.get("other")); + } + } else { + childbirthManagerQueryModel.setLoseBloodCause(""); } - if (SXCauseEnums.O5.getName().equals(childbirthManagerQueryModel.getLoseBloodCause()) && org.apache.commons.lang.StringUtils.isNotEmpty(loseBloodCauseMap.get("other"))) { - childbirthManagerQueryModel.setLoseBloodCause(loseBloodCauseMap.get("other")); - } - } else { - childbirthManagerQueryModel.setLoseBloodCause(""); } - } - // 查询分娩方式 - childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); - if (initQuery.contains("deliveryMode")) { - String deliveryModeJson = maternalDeliverModel.getDeliveryMode(); - Map deliveryModeMap = JsonUtil.getMap(deliveryModeJson); - if (MapUtils.isNotEmpty(deliveryModeMap) && org.apache.commons.lang.StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) { - for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) { - if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) { - childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName()); - break; + // 查询分娩方式 + childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); + if (initQuery.contains("deliveryMode")) { + String deliveryModeJson = maternalDeliverModel.getDeliveryMode(); + Map deliveryModeMap = JsonUtil.getMap(deliveryModeJson); + if (MapUtils.isNotEmpty(deliveryModeMap) && org.apache.commons.lang.StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) { + for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) { + if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) { + childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName()); + break; + } } + } else { + childbirthManagerQueryModel.setDeliveryMode(""); } - } else { - childbirthManagerQueryModel.setDeliveryMode(""); } - } - // 产妇情况 - if (initQuery.contains("maternalInfo")) { - if (org.apache.commons.lang.StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) { - for (CfEnums cfEnums : CfEnums.values()) { - if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) { - childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName()); - break; + // 产妇情况 + if (initQuery.contains("maternalInfo")) { + if (org.apache.commons.lang.StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) { + for (CfEnums cfEnums : CfEnums.values()) { + if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) { + childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName()); + break; + } } } } - } - // 查询接生医生 - try { - if (initQuery.contains("deliverDoctor")) { - childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName()); + // 查询接生医生 + try { + if (initQuery.contains("deliverDoctor")) { + childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName()); + } + } catch (Exception e) { + // 什么都不干，这么干是为了避开原始数据的问题 } - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 - } - // 查分娩医院 - try { - if (initQuery.contains("fmHospital")) { - System.out.println("分娩医院：" + maternalDeliverModel.getFmHospital()); - if (org.apache.commons.lang.StringUtils.isNumeric(maternalDeliverModel.getFmHospital())) { - childbirthManagerQueryModel.setFmHospital(organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getFmHospital())).getName()); - } else { - childbirthManagerQueryModel.setFmHospital(maternalDeliverModel.getFmHospital()); + // 查分娩医院 + try { + if (initQuery.contains("fmHospital")) { + System.out.println("分娩医院：" + maternalDeliverModel.getFmHospital()); + if (org.apache.commons.lang.StringUtils.isNumeric(maternalDeliverModel.getFmHospital())) { + childbirthManagerQueryModel.setFmHospital(organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getFmHospital())).getName()); + } else { + childbirthManagerQueryModel.setFmHospital(maternalDeliverModel.getFmHospital()); + } } + } catch (Exception e) { + // 什么都不干，这么干是为了避开原始数据的问题 } - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 - } - // 胎方位，胎心率，胎先露 - if (initQuery.contains("fetalPosition") || initQuery.contains("heartRate") || initQuery.contains("fetalPresentation")) { - // 这个泛型不会出错，传入的就是这个 - @SuppressWarnings("unchecked") - List placentaList = maternalDeliverModel.getPlacentas(); - if (CollectionUtils.isNotEmpty(placentaList)) { - String fetalPosition = ""; - String heartRate = ""; - String fetalPresentation = ""; - for (Object obj : placentaList) { - if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) { - MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj; - if (initQuery.contains("fetalPosition")) { - for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { - if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) { - fetalPosition += fetalPositionEnums.getName() + ","; - break; - } - } - } - heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ","; - fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ","; - } - if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) { - Map placenta = JsonUtil.getMap(obj.toString()); - if (initQuery.contains("fetalPosition")) { - if (MapUtils.isNotEmpty(placenta)) { + // 胎方位，胎心率，胎先露 + if (initQuery.contains("fetalPosition") || initQuery.contains("heartRate") || initQuery.contains("fetalPresentation")) { + // 这个泛型不会出错，传入的就是这个 + @SuppressWarnings("unchecked") + List placentaList = maternalDeliverModel.getPlacentas(); + if (CollectionUtils.isNotEmpty(placentaList)) { + String fetalPosition = ""; + String heartRate = ""; + String fetalPresentation = ""; + for (Object obj : placentaList) { + if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) { + MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj; + if (initQuery.contains("fetalPosition")) { for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { - if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) { + if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) { fetalPosition += fetalPositionEnums.getName() + ","; break; } } - heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ","; - for (FetalEnums fetalEnums : FetalEnums.values()) { - if (fetalEnums.getId().equals(placenta.get("fetalPresentation"))) { - fetalPresentation += fetalEnums.getName() + ","; - break; + } + heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ","; + fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ","; + } + if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) { + Map placenta = JsonUtil.getMap(obj.toString()); + if (initQuery.contains("fetalPosition")) { + if (MapUtils.isNotEmpty(placenta)) { + for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { + if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) { + fetalPosition += fetalPositionEnums.getName() + ","; + break; + } + } + heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ","; + for (FetalEnums fetalEnums : FetalEnums.values()) { + if (fetalEnums.getId().equals(placenta.get("fetalPresentation"))) { + fetalPresentation += fetalEnums.getName() + ","; + break; + } } } } } } + childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1)); + childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1)); + childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1)); } - childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1)); - childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1)); - childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1)); } - } - // 第一产程，第二产程，第三产程 - Map> prodprocessMap = JsonUtil.getDoubleMap(maternalDeliverModel.getProdprocess()); - if (MapUtils.isNotEmpty(prodprocessMap)) { - Map prodprocessOne = prodprocessMap.get("one"); - if (MapUtils.isNotEmpty(prodprocessOne)) { - childbirthManagerQueryModel.setProdprocessOne(prodprocessOne.get("h") + "时," + prodprocessOne.get("m") + "分"); - } else { - childbirthManagerQueryModel.setProdprocessOne(""); - } - Map prodprocessTwo = prodprocessMap.get("two"); - if (MapUtils.isNotEmpty(prodprocessTwo)) { - childbirthManagerQueryModel.setProdprocessTwo(prodprocessTwo.get("h") + "时," + prodprocessTwo.get("m") + "分"); - } else { - childbirthManagerQueryModel.setProdprocessTwo(""); + // 第一产程，第二产程，第三产程 + Map> prodprocessMap = JsonUtil.getDoubleMap(maternalDeliverModel.getProdprocess()); + if (MapUtils.isNotEmpty(prodprocessMap)) { + Map prodprocessOne = prodprocessMap.get("one"); + if (MapUtils.isNotEmpty(prodprocessOne)) { + childbirthManagerQueryModel.setProdprocessOne(prodprocessOne.get("h") + "时," + prodprocessOne.get("m") + "分"); + } else { + childbirthManagerQueryModel.setProdprocessOne(""); + } + Map prodprocessTwo = prodprocessMap.get("two"); + if (MapUtils.isNotEmpty(prodprocessTwo)) { + childbirthManagerQueryModel.setProdprocessTwo(prodprocessTwo.get("h") + "时," + prodprocessTwo.get("m") + "分"); + } else { + childbirthManagerQueryModel.setProdprocessTwo(""); + } + Map prodprocessThree = prodprocessMap.get("three"); + if (MapUtils.isNotEmpty(prodprocessThree)) { + childbirthManagerQueryModel.setProdprocessThree(prodprocessThree.get("h") + "时," + prodprocessThree.get("m") + "分"); + } else { + childbirthManagerQueryModel.setProdprocessThree(""); + } } - Map prodprocessThree = prodprocessMap.get("three"); - if (MapUtils.isNotEmpty(prodprocessThree)) { - childbirthManagerQueryModel.setProdprocessThree(prodprocessThree.get("h") + "时," + prodprocessThree.get("m") + "分"); + + // 总产程 + Map totalprocessMap = JsonUtil.getMap(maternalDeliverModel.getTotalprocess()); + if (MapUtils.isNotEmpty(totalprocessMap)) { + childbirthManagerQueryModel.setTotalprocess(totalprocessMap.get("h") + "时" + totalprocessMap.get("m") + "分"); } else { - childbirthManagerQueryModel.setProdprocessThree(""); + childbirthManagerQueryModel.setTotalprocess(""); } - } - - // 总产程 - Map totalprocessMap = JsonUtil.getMap(maternalDeliverModel.getTotalprocess()); - if (MapUtils.isNotEmpty(totalprocessMap)) { - childbirthManagerQueryModel.setTotalprocess(totalprocessMap.get("h") + "时" + totalprocessMap.get("m") + "分"); - } else { - childbirthManagerQueryModel.setTotalprocess(""); - } - // 死亡原因 - if (initQuery.contains("deathCause")) { - for (DeathCauseEnums deathCauseEnums : DeathCauseEnums.values()) { - if (deathCauseEnums.getId().equals(maternalDeliverModel.getDeathCause())) { - childbirthManagerQueryModel.setDeathCause(deathCauseEnums.getName()); - break; + // 死亡原因 + if (initQuery.contains("deathCause")) { + for (DeathCauseEnums deathCauseEnums : DeathCauseEnums.values()) { + if (deathCauseEnums.getId().equals(maternalDeliverModel.getDeathCause())) { + childbirthManagerQueryModel.setDeathCause(deathCauseEnums.getName()); + break; + } } } - } - // 收缩压，舒张压 - Map chBpMap = JsonUtil.getMap(maternalDeliverModel.getChBp()); - if (MapUtils.isNotEmpty(chBpMap)) { - childbirthManagerQueryModel.setChBpSsy1(chBpMap.get("ssy")); - childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy")); + // 收缩压，舒张压 + Map chBpMap = JsonUtil.getMap(maternalDeliverModel.getChBp()); + if (MapUtils.isNotEmpty(chBpMap)) { + childbirthManagerQueryModel.setChBpSsy1(chBpMap.get("ssy")); + childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy")); - } + } - // 产后1/2/24小时失血量 - childbirthManagerQueryModel.setOhloseBloodL(maternalDeliverModel.getoHloseBloodL()); - childbirthManagerQueryModel.setThloseBloodL(maternalDeliverModel.gettHloseBloodL()); - childbirthManagerQueryModel.setRhloseBloodL(maternalDeliverModel.getrHloseBloodL()); + // 产后1/2/24小时失血量 + childbirthManagerQueryModel.setOhloseBloodL(maternalDeliverModel.getoHloseBloodL()); + childbirthManagerQueryModel.setThloseBloodL(maternalDeliverModel.gettHloseBloodL()); + childbirthManagerQueryModel.setRhloseBloodL(maternalDeliverModel.getrHloseBloodL()); - // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型 - if (initQuery.contains("tpmcType") || initQuery.contains("tpSize") || initQuery.contains("tpWeight") || initQuery.contains("umbilicalCordLength") || initQuery.contains("umbilicalCordEx") || initQuery.contains("umbilicalCordExType")) { - List extPlacentaList = maternalDeliverModel.getExtPlacentas(); - if (CollectionUtils.isNotEmpty(extPlacentaList)) { - String tpmcType = ""; - String tpSize = ""; - String tpWeight = ""; - String umbilicalCordLength = ""; - String umbilicalCordEx = ""; - String umbilicalCordExType = ""; - try { - for (MaternalDeliverModel.ExtPlacenta extPlacenta : extPlacentaList) { - if (initQuery.contains("tpmcType")) { - for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) { - if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) { - tpmcType += tpmcTypeEnums.getName() + ","; - break; + // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型 + if (initQuery.contains("tpmcType") || initQuery.contains("tpSize") || initQuery.contains("tpWeight") || initQuery.contains("umbilicalCordLength") || initQuery.contains("umbilicalCordEx") || initQuery.contains("umbilicalCordExType")) { + List extPlacentaList = maternalDeliverModel.getExtPlacentas(); + if (CollectionUtils.isNotEmpty(extPlacentaList)) { + String tpmcType = ""; + String tpSize = ""; + String tpWeight = ""; + String umbilicalCordLength = ""; + String umbilicalCordEx = ""; + String umbilicalCordExType = ""; + try { + for (MaternalDeliverModel.ExtPlacenta extPlacenta : extPlacentaList) { + if (initQuery.contains("tpmcType")) { + for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) { + if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) { + tpmcType += tpmcTypeEnums.getName() + ","; + break; + } } } - } - if (initQuery.contains("umbilicalCordExType")) { - String umbilicalCordExTypeTemp = ""; - for (QiDaiEnums qiDaiEnums : QiDaiEnums.values()) { - if (qiDaiEnums.getId().equals(extPlacenta.getUmbilicalCordExType())) { - umbilicalCordExTypeTemp = qiDaiEnums.getName() + ","; - break; + if (initQuery.contains("umbilicalCordExType")) { + String umbilicalCordExTypeTemp = ""; + for (QiDaiEnums qiDaiEnums : QiDaiEnums.values()) { + if (qiDaiEnums.getId().equals(extPlacenta.getUmbilicalCordExType())) { + umbilicalCordExTypeTemp = qiDaiEnums.getName() + ","; + break; + } } + if (org.apache.commons.lang.StringUtils.isEmpty(umbilicalCordExTypeTemp)) { + umbilicalCordExTypeTemp = "-,"; + } + umbilicalCordExType += umbilicalCordExTypeTemp; } - if (org.apache.commons.lang.StringUtils.isEmpty(umbilicalCordExTypeTemp)) { - umbilicalCordExTypeTemp = "-,"; - } - umbilicalCordExType += umbilicalCordExTypeTemp; - } - if (initQuery.contains("umbilicalCordEx")) { - if ("yes".equals(extPlacenta.getUmbilicalCordEx())) { - umbilicalCordEx += "是" + ","; - } else if ("no".equals(extPlacenta.getUmbilicalCordEx())) { - umbilicalCordEx += "否" + ","; - } else { - umbilicalCordEx += "-" + ","; + if (initQuery.contains("umbilicalCordEx")) { + if ("yes".equals(extPlacenta.getUmbilicalCordEx())) { + umbilicalCordEx += "是" + ","; + } else if ("no".equals(extPlacenta.getUmbilicalCordEx())) { + umbilicalCordEx += "否" + ","; + } else { + umbilicalCordEx += "-" + ","; + } } - } - if (initQuery.contains("tpSize")) { - if (MapUtils.isNotEmpty(extPlacenta.getTpSize())) { - tpSize += "长:" + extPlacenta.getTpSize().get("c") + "宽:" + extPlacenta.getTpSize().get("k") + "高:" + extPlacenta.getTpSize().get("g") + ","; + if (initQuery.contains("tpSize")) { + if (MapUtils.isNotEmpty(extPlacenta.getTpSize())) { + tpSize += "长:" + extPlacenta.getTpSize().get("c") + "宽:" + extPlacenta.getTpSize().get("k") + "高:" + extPlacenta.getTpSize().get("g") + ","; + } } + tpWeight += extPlacenta.getTpWeight() == null ? "" : extPlacenta.getTpWeight() + ","; + umbilicalCordLength += extPlacenta.getUmbilicalCordLength() == null ? "" : extPlacenta.getUmbilicalCordLength() + ","; } - tpWeight += extPlacenta.getTpWeight() == null ? "" : extPlacenta.getTpWeight() + ","; - umbilicalCordLength += extPlacenta.getUmbilicalCordLength() == null ? "" : extPlacenta.getUmbilicalCordLength() + ","; + } catch (Exception e) { + // 什么都不干，这么干是为了避开原始数据的问题 } - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 + childbirthManagerQueryModel.setTpmcType(tpmcType.length() == 0 ? "" : tpmcType.substring(0, tpmcType.length() - 1)); + childbirthManagerQueryModel.setTpSize(tpSize.length() == 0 ? "" : tpSize.substring(0, tpSize.length() - 1)); + childbirthManagerQueryModel.setTpWeight(tpWeight.length() == 0 ? "" : tpWeight.substring(0, tpWeight.length() - 1)); + childbirthManagerQueryModel.setUmbilicalCordLength(umbilicalCordLength.length() == 0 ? "" : umbilicalCordLength.substring(0, umbilicalCordLength.length() - 1)); + childbirthManagerQueryModel.setUmbilicalCordEx(umbilicalCordEx.length() == 0 ? "" : umbilicalCordEx.substring(0, umbilicalCordEx.length() - 1)); + childbirthManagerQueryModel.setUmbilicalCordExType(umbilicalCordExType.length() == 0 ? "" : umbilicalCordExType.substring(0, umbilicalCordExType.length() - 1)); } - childbirthManagerQueryModel.setTpmcType(tpmcType.length() == 0 ? "" : tpmcType.substring(0, tpmcType.length() - 1)); - childbirthManagerQueryModel.setTpSize(tpSize.length() == 0 ? "" : tpSize.substring(0, tpSize.length() - 1)); - childbirthManagerQueryModel.setTpWeight(tpWeight.length() == 0 ? "" : tpWeight.substring(0, tpWeight.length() - 1)); - childbirthManagerQueryModel.setUmbilicalCordLength(umbilicalCordLength.length() == 0 ? "" : umbilicalCordLength.substring(0, umbilicalCordLength.length() - 1)); - childbirthManagerQueryModel.setUmbilicalCordEx(umbilicalCordEx.length() == 0 ? "" : umbilicalCordEx.substring(0, umbilicalCordEx.length() - 1)); - childbirthManagerQueryModel.setUmbilicalCordExType(umbilicalCordExType.length() == 0 ? "" : umbilicalCordExType.substring(0, umbilicalCordExType.length() - 1)); } } - } - childbirthManagerQueryModelList.add(childbirthManagerQueryModel); + childbirthManagerQueryModelList.add(childbirthManagerQueryModel); + } + }catch (Exception e) + { + e.printStackTrace(); } return childbirthManagerQueryModelList; } -- 1.8.3.1