Commit 8e29570bfcf1c7ecb35969f8dda2d8022bda3961
1 parent
fd3801843a
Exists in
master
and in
6 other branches
血糖报告
Showing 1 changed file with 18 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
View file @
8e29570
... | ... | @@ -718,8 +718,24 @@ |
718 | 718 | } |
719 | 719 | else |
720 | 720 | { |
721 | - dietModel = dietModels.get(0); | |
722 | - blood.setKcalId(dietModel.getId()); | |
721 | + if (StringUtils.isEmpty(blood.getKcalId())) | |
722 | + { | |
723 | + dietModel = dietModels.get(0); | |
724 | + blood.setKcalId(dietModel.getId()); | |
725 | + } | |
726 | + else | |
727 | + { | |
728 | + for (BloodSugarConfigModel bcm : dietModels) { | |
729 | + if (bcm.getId().equals(blood.getKcalId())) { | |
730 | + dietModel = bcm; | |
731 | + break; | |
732 | + } | |
733 | + } | |
734 | + } | |
735 | + if (dietModel == null) | |
736 | + { | |
737 | + dietModel = dietModels.get(0); | |
738 | + } | |
723 | 739 | } |
724 | 740 | |
725 | 741 | //更新状态为查看 |