Commit 6437fff7b457874a8e96c03aa12a14f6b4c9c113
1 parent
729ba5dc9a
Exists in
master
and in
6 other branches
儿童测量支持母亲身份证查询
Showing 2 changed files with 7 additions and 13 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
6437fff
| ... | ... | @@ -909,21 +909,17 @@ |
| 909 | 909 | } |
| 910 | 910 | |
| 911 | 911 | //如果初诊也没有孕前体重和身高 就在预约建档信息中获取 |
| 912 | - if (StringUtils.isEmpty(beforeHeight)) | |
| 913 | - { | |
| 912 | + if (StringUtils.isEmpty(beforeHeight)) { | |
| 914 | 913 | try { |
| 915 | 914 | ArchiveDataQuery query = new ArchiveDataQuery(); |
| 916 | 915 | query.setIdCard(pat.getCardNo()); |
| 917 | 916 | List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery()); |
| 918 | - if (CollectionUtils.isNotEmpty(list)) | |
| 919 | - { | |
| 917 | + if (CollectionUtils.isNotEmpty(list)) { | |
| 920 | 918 | ArchiveData data = list.get(0); |
| 921 | 919 | String json = data.getJsonData(); |
| 922 | - if (StringUtils.isNotEmpty(json)) | |
| 923 | - { | |
| 920 | + if (StringUtils.isNotEmpty(json)) { | |
| 924 | 921 | JSONObject jsonObject = JsonUtil.getObj(json); |
| 925 | - if (jsonObject != null && jsonObject.getJSONObject("history") != null) | |
| 926 | - { | |
| 922 | + if (jsonObject != null && jsonObject.getJSONObject("history") != null) { | |
| 927 | 923 | JSONObject historyJsonObj = jsonObject.getJSONObject("history"); |
| 928 | 924 | |
| 929 | 925 | beforeWeight = historyJsonObj.get("yqWeight") == null ? "" : historyJsonObj.get("yqWeight").toString(); |
| ... | ... | @@ -931,9 +927,7 @@ |
| 931 | 927 | } |
| 932 | 928 | } |
| 933 | 929 | } |
| 934 | - } | |
| 935 | - catch (Exception e) | |
| 936 | - { | |
| 930 | + } catch (Exception e) { | |
| 937 | 931 | ExceptionUtils.catchException(e, " 就在预约建档信息中获取错误"); |
| 938 | 932 | } |
| 939 | 933 | |
| ... | ... | @@ -1436,7 +1430,8 @@ |
| 1436 | 1430 | if ("2".equals(certType)) { |
| 1437 | 1431 | query.setVcCardNo(certNo); |
| 1438 | 1432 | } else { |
| 1439 | - query.setPhoneOrcardNo(certNo); | |
| 1433 | + //通过母亲身份证或者电话查询 | |
| 1434 | + query.setQueryNo(certNo); | |
| 1440 | 1435 | } |
| 1441 | 1436 | |
| 1442 | 1437 | List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(query); |