Commit efbf974621c616069cf45ef5b2bba2b4cdfb750f
Exists in
master
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
efbf974
| ... | ... | @@ -2280,7 +2280,7 @@ |
| 2280 | 2280 | map.put("height",checkModel.getHeight()); //身长 |
| 2281 | 2281 | map.put("weight", checkModel.getWeight()); //体重 |
| 2282 | 2282 | StringBuffer sb = new StringBuffer(); |
| 2283 | - if (StringUtils.isNotEmpty(checkModel.getGrowthEvaluate()) && "[\"null\"]".equals(checkModel.getGrowthEvaluate())) | |
| 2283 | + if (StringUtils.isNotEmpty(checkModel.getGrowthEvaluate()) && !"[\"null\"]".equals(checkModel.getGrowthEvaluate())) | |
| 2284 | 2284 | { |
| 2285 | 2285 | List<String> items = JsonUtil.toList(checkModel.getGrowthEvaluate(),String.class); |
| 2286 | 2286 | if (CollectionUtils.isNotEmpty(items)) |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
View file @
efbf974
| ... | ... | @@ -119,6 +119,7 @@ |
| 119 | 119 | public AntenatalExaminationModel convertToDataModel() { |
| 120 | 120 | AntenatalExaminationModel examinationModel = new AntenatalExaminationModel(); |
| 121 | 121 | examinationModel.setId(id); |
| 122 | + examinationModel.setBarCode(barCode); | |
| 122 | 123 | examinationModel.setParentId(parentId); |
| 123 | 124 | examinationModel.setCurrentDueDate(currentDueDate); |
| 124 | 125 | examinationModel.setChiefComplaint(chiefComplaint); |