diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java index ed34db9..30ca764 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java @@ -139,7 +139,7 @@ public class PoultryReportActvity extends BaseActivity { if (rpcList.get(i).getDecimal("FemalePerFeedNumber")!=null){ FemalePerFeedNumber = rpcList.get(i).getDecimal("FemalePerFeedNumber")+""; } - if (rpcList.get(i).getDecimal("FemaleEatTime")!=null){ + if (rpcList.get(i).getDecimal("FemaleEatTime")!=null && rpcList.get(i).getDecimal("FemaleEatTime").compareTo(BigDecimal.ZERO)!=0){ FemaleEatTime = rpcList.get(i).getDecimal("FemaleEatTime")+""; } reportBeanList.add(new PoultryReportBean(rpcList.get(i).getLong("House_ID"),House_Name,Week,FemaleSiTaoNumber diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java index 86dab53..56e57c0 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java @@ -100,9 +100,9 @@ public class YuchuFragment extends BaseFragment { } if (detailsList.get(j).getDecimal("SurvivalRate")!=null) { - item4.setText("成活率:" + detailsList.get(j).getDecimal("SurvivalRate").multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString() + "%"); + item4.setText("母成活率:" + detailsList.get(j).getDecimal("SurvivalRate").multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString() + "%"); }else { - item4.setText("成活率:"); + item4.setText("母成活率:"); } secondContent.addView(view2); }