Commit 07cade676be0e21a1285c59eff0a9d132b2590aa
1 parent
945935ca5d
Exists in
master
and in
8 other branches
增加
Showing 1 changed file with 32 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
View file @
07cade6
| ... | ... | @@ -743,18 +743,38 @@ |
| 743 | 743 | setNeonatalAsphyxia(destModel.getNeonatalAsphyxia()); |
| 744 | 744 | setDeformity(JsonUtil.str2Obj(destModel.getDeformity(), Map.class)); |
| 745 | 745 | setDays(destModel.getDays()); |
| 746 | - setHearing(destModel.getHearing()); | |
| 746 | + if(null!=destModel.getHearing()){ | |
| 747 | + setHearing(destModel.getHearing()); | |
| 748 | + } | |
| 747 | 749 | setDisease(JsonUtil.str2Obj(destModel.getDisease(), Map.class)); |
| 748 | - setBirthWeight(destModel.getBirthWeight()); | |
| 749 | - setWeight(destModel.getWeight()); | |
| 750 | - setHeight(destModel.getHeight()); | |
| 751 | - setFeedType(destModel.getFeedType()); | |
| 752 | - setEatMilk(destModel.getEatMilk()); | |
| 753 | - setEatTime(destModel.getEatTime()); | |
| 754 | - setEmesis(destModel.getEmesis()); | |
| 750 | + if(null!=destModel.getBirthWeight()){ | |
| 751 | + setBirthWeight(destModel.getBirthWeight()); | |
| 752 | + } | |
| 753 | + if(null!=destModel.getWeight()) { | |
| 754 | + setWeight(destModel.getWeight()); | |
| 755 | + } | |
| 756 | + if(null!=destModel.getHeight()) { | |
| 757 | + setHeight(destModel.getHeight()); | |
| 758 | + } | |
| 759 | + if(null!=destModel.getFeedType()) { | |
| 760 | + setFeedType(destModel.getFeedType()); | |
| 761 | + } | |
| 762 | + if(null!=destModel.getEatTime()){ | |
| 763 | + setEatTime(destModel.getEatTime()); | |
| 764 | + } | |
| 765 | + if(null!=destModel.getEatMilk()){ | |
| 766 | + setEatMilk(destModel.getEatMilk()); | |
| 767 | + } | |
| 768 | + if(null!=destModel.getEmesis()){ | |
| 769 | + setEmesis(destModel.getEmesis()); | |
| 770 | + } | |
| 755 | 771 | setEarAppearance(JsonUtil.str2Obj(destModel.getEarAppearance(), Map.class)); |
| 756 | - setShit(destModel.getShit()); | |
| 757 | - setShitTimes(destModel.getShitTimes()); | |
| 772 | + if(null!=destModel.getShit()) { | |
| 773 | + setShit(destModel.getShit()); | |
| 774 | + } | |
| 775 | + if(null!=destModel.getShitTimes()){ | |
| 776 | + setShitTimes(destModel.getShitTimes()); | |
| 777 | + } | |
| 758 | 778 | setSkin(JsonUtil.str2Obj(destModel.getSkin(), Map.class)); |
| 759 | 779 | setNose(JsonUtil.str2Obj(destModel.getNose(), Map.class)); |
| 760 | 780 | setNextVisitAddr(destModel.getNextVisitAddr()); |
| ... | ... | @@ -786,6 +806,8 @@ |
| 786 | 806 | return this; |
| 787 | 807 | } |
| 788 | 808 | } |
| 809 | + | |
| 810 | + | |
| 789 | 811 | |
| 790 | 812 | @Override |
| 791 | 813 | public BabyVisitResult convertToResult(PuerperaModel destModel) { |