Commit 5a2a7a23e856a6d288b653cdbc7b5fe837e51e72
1 parent
073a34ed5d
Exists in
master
and in
6 other branches
儿保检查列表id返回
Showing 3 changed files with 5 additions and 16 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/PatientWeight.java
View file @
5a2a7a2
| ... | ... | @@ -10,7 +10,7 @@ |
| 10 | 10 | /** |
| 11 | 11 | * 孕产妇体重管理 |
| 12 | 12 | */ |
| 13 | -@Document(collection="lyms_patient_weight") | |
| 13 | +@Document(collection = "lyms_patient_weight") | |
| 14 | 14 | public class PatientWeight extends BaseModel { |
| 15 | 15 | |
| 16 | 16 | @Transient |
| ... | ... | @@ -143,18 +143,6 @@ |
| 143 | 143 | public void setPrinting(boolean printing) { |
| 144 | 144 | this.printing = printing; |
| 145 | 145 | } |
| 146 | - | |
| 147 | - public Date getPrintingTime() { | |
| 148 | - return printingTime; | |
| 149 | - } | |
| 150 | - | |
| 151 | - public void setPrintingTime(Date printingTime) { | |
| 152 | - this.printingTime = printingTime; | |
| 153 | - } | |
| 154 | - | |
| 155 | - //打印时间 | |
| 156 | - private Date printingTime; | |
| 157 | - | |
| 158 | 146 | |
| 159 | 147 | public Date getPrintingTime() { |
| 160 | 148 | return printingTime; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
5a2a7a2
| ... | ... | @@ -804,6 +804,7 @@ |
| 804 | 804 | Map<String, Object> map = new HashMap<>(); |
| 805 | 805 | if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { |
| 806 | 806 | BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class); |
| 807 | + map.put("id", babyModel.getId()); | |
| 807 | 808 | map.put("babyName", babyModel.getName()); |
| 808 | 809 | map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); |
| 809 | 810 | map.put("mName", babyModel.getMname()); |
| ... | ... | @@ -2369,7 +2370,7 @@ |
| 2369 | 2370 | //kaul = getKaul(kaul); |
| 2370 | 2371 | |
| 2371 | 2372 | int k = (int) (kaul / 100) * 100; |
| 2372 | - kaul = (double)k; | |
| 2373 | + kaul = (double) k; | |
| 2373 | 2374 | |
| 2374 | 2375 | if (kaul < 800) { |
| 2375 | 2376 | kaul = 800D; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
5a2a7a2
| ... | ... | @@ -1314,7 +1314,6 @@ |
| 1314 | 1314 | //身高评价 |
| 1315 | 1315 | String heightEvaluate = babyCheckFacade.getGrowthValue1(DateUtil.getyyyy_MM_dd(baby.getBirth()), model.getHeight(), baby.getSex(), 1, null, DateUtil.getyyyy_MM_dd(baby.getCreated())); |
| 1316 | 1316 | map.put("heightEvaluate", heightEvaluate); |
| 1317 | - | |
| 1318 | 1317 | int month = DateUtil.getMonth(baby.getBirth(), model.getNutritiTime()); |
| 1319 | 1318 | if (month > 36) { |
| 1320 | 1319 | return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("月龄范围没有报告"); |
| ... | ... | @@ -1346,7 +1345,8 @@ |
| 1346 | 1345 | } else if (kaupEvaluate.equals("正常") && month >= 6 && month <= 11) { |
| 1347 | 1346 | List<BabyDietReportModel> babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month)), BabyDietReportModel.class); |
| 1348 | 1347 | for (BabyDietReportModel babyDiet : babyDietReportList) { |
| 1349 | - if (month == 6 && babyDiet.getShape() == 1) { | |
| 1348 | + | |
| 1349 | + if (null != babyDiet.getShape() && month == 6 && babyDiet.getShape() == 1) { | |
| 1350 | 1350 | if (StringUtils.isNotEmpty(model.getFeedType())) { |
| 1351 | 1351 | if (Integer.valueOf(model.getFeedType()) == month) { |
| 1352 | 1352 | data.put("feedingGuide", babyDiet.getFeedingGuide()); |