Commit 4884fdb3aba9cb80408a580ec44e9015cd7b3d24
1 parent
b61b1f172e
Exists in
master
and in
6 other branches
bug修改
Showing 3 changed files with 19 additions and 11 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java
View file @
4884fdb
| ... | ... | @@ -4347,7 +4347,7 @@ |
| 4347 | 4347 | } |
| 4348 | 4348 | |
| 4349 | 4349 | |
| 4350 | - Sheet s4 = wb.getSheet(4); | |
| 4350 | + /*Sheet s4 = wb.getSheet(4); | |
| 4351 | 4351 | System.out.println(s4.getName() + " : "); |
| 4352 | 4352 | int rows4 = s4.getRows(); |
| 4353 | 4353 | if (rows4 > 0) { |
| 4354 | 4354 | |
| ... | ... | @@ -4388,9 +4388,9 @@ |
| 4388 | 4388 | } |
| 4389 | 4389 | mongoTemplate.save(babyDiet); |
| 4390 | 4390 | } |
| 4391 | - } | |
| 4391 | + }*/ | |
| 4392 | 4392 | |
| 4393 | - Sheet s5 = wb.getSheet(5); | |
| 4393 | + Sheet s5 = wb.getSheet(4); | |
| 4394 | 4394 | System.out.println(s5.getName() + " : "); |
| 4395 | 4395 | int rows5 = s5.getRows(); |
| 4396 | 4396 | if (rows5 > 0) { |
| ... | ... | @@ -4422,7 +4422,7 @@ |
| 4422 | 4422 | } |
| 4423 | 4423 | } |
| 4424 | 4424 | |
| 4425 | - Sheet s6 = wb.getSheet(6); | |
| 4425 | + Sheet s6 = wb.getSheet(5); | |
| 4426 | 4426 | System.out.println(s6.getName() + " : "); |
| 4427 | 4427 | int rows6 = s6.getRows(); |
| 4428 | 4428 | if (rows6 > 0) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java
View file @
4884fdb
| ... | ... | @@ -1377,9 +1377,14 @@ |
| 1377 | 1377 | } |
| 1378 | 1378 | } |
| 1379 | 1379 | } else { |
| 1380 | - if (CollectionUtils.isNotEmpty(babyDiet.getFeedingGuide())) { | |
| 1381 | - data.put("feedingGuide", babyDiet.getFeedingGuide()); | |
| 1380 | + if (null != babyDiet.getShape()) { | |
| 1381 | + if (CollectionUtils.isNotEmpty(babyDiet.getFeedingGuide()) && kaupEvaluate.equals("消瘦") && babyDiet.getShape() == 0) { | |
| 1382 | + data.put("feedingGuide", babyDiet.getFeedingGuide()); | |
| 1383 | + } else if (CollectionUtils.isNotEmpty(babyDiet.getFeedingGuide()) && kaupEvaluate.equals("超重") && babyDiet.getShape() == 2) { | |
| 1384 | + data.put("feedingGuide", babyDiet.getFeedingGuide()); | |
| 1385 | + } | |
| 1382 | 1386 | } |
| 1387 | + | |
| 1383 | 1388 | } |
| 1384 | 1389 | if (null != babyDiet.getKcal() && null != babyDiet.getWeightType()) { |
| 1385 | 1390 | if (babyDiet.getWeightType() == 1 && babyDiet.getKcal() == kaul) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
View file @
4884fdb
| ... | ... | @@ -293,13 +293,16 @@ |
| 293 | 293 | BasicConfig basicConfig = ba.convertToDataModel(); |
| 294 | 294 | if (null != basicConfig) { |
| 295 | 295 | basicConfig.setCreateDate(System.currentTimeMillis()); |
| 296 | - if (StringUtils.isEmpty(basicConfig.getTypeId())) { | |
| 296 | + if(StringUtils.isEmpty(basicConfig.getTypeId())){ | |
| 297 | 297 | BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); |
| 298 | - if (basicConfig1 != null) { | |
| 299 | - //高危儿因素配置暂时这么开发 | |
| 300 | - if ("高危儿因素".equals(basicConfig1.getName()) || "体弱儿因素".equals(basicConfig1.getName())) { | |
| 298 | + if(basicConfig1!=null){ | |
| 299 | + //高危儿配置 | |
| 300 | + if ("高危儿因素".equals(basicConfig1.getName()) || "体弱儿因素".equals(basicConfig1.getName())) | |
| 301 | + { | |
| 301 | 302 | basicConfig.setTypeId("5b18f8a7422b03d4ad2bf913"); |
| 302 | - } else { | |
| 303 | + } | |
| 304 | + else | |
| 305 | + { | |
| 303 | 306 | basicConfig.setTypeId(basicConfig1.getTypeId()); |
| 304 | 307 | } |
| 305 | 308 | basicConfig.setpId(basicConfig.getParentId()); |