diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index f60bd08..b3d6791 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -909,21 +909,17 @@ public class MeasureInfoFacade { } //如果初诊也没有孕前体重和身高 就在预约建档信息中获取 - if (StringUtils.isEmpty(beforeHeight)) - { + if (StringUtils.isEmpty(beforeHeight)) { try { ArchiveDataQuery query = new ArchiveDataQuery(); query.setIdCard(pat.getCardNo()); List list = archiveDataServicer.query(query.convertToQuery()); - if (CollectionUtils.isNotEmpty(list)) - { + if (CollectionUtils.isNotEmpty(list)) { ArchiveData data = list.get(0); String json = data.getJsonData(); - if (StringUtils.isNotEmpty(json)) - { + if (StringUtils.isNotEmpty(json)) { JSONObject jsonObject = JsonUtil.getObj(json); - if (jsonObject != null && jsonObject.getJSONObject("history") != null) - { + if (jsonObject != null && jsonObject.getJSONObject("history") != null) { JSONObject historyJsonObj = jsonObject.getJSONObject("history"); beforeWeight = historyJsonObj.get("yqWeight") == null ? "" : historyJsonObj.get("yqWeight").toString(); @@ -931,9 +927,7 @@ public class MeasureInfoFacade { } } } - } - catch (Exception e) - { + } catch (Exception e) { ExceptionUtils.catchException(e, " 就在预约建档信息中获取错误"); } @@ -1436,7 +1430,8 @@ public class MeasureInfoFacade { if ("2".equals(certType)) { query.setVcCardNo(certNo); } else { - query.setPhoneOrcardNo(certNo); + //通过母亲身份证或者电话查询 + query.setQueryNo(certNo); } List models = babyBookbuildingService.queryBabyBuildByCond(query); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java index 6190cec..32b60c3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java @@ -111,7 +111,6 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { basicsInfo.put("basicsInfo", volumeComponentAnalysisModel); - } return null;