Merge branch 'developer' into 'master'

线上权限调整

See merge request !49

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java

@@ -112,8 +112,9 @@ public class IndexController {
         if(birthOrderCnt.isSuccess() && birthOrderCnt.getResult() != null){
             IndexMemberBirthCntDTO birthOrderCntResult = birthOrderCnt.getResult();
             consume.setBirthRate(DataFormatUtils.rate(birthOrderCntResult.getBirthCnt(), birthOrderCntResult.getAllCnt()));
-            consume.setBirthHb(DataFormatUtils.divide(DataFormatUtils.divideDouble(birthOrderCntResult.getBirthCnt(), birthOrderCntResult.getBirthCntHb()),
-                    DataFormatUtils.divideDouble(birthOrderCntResult.getAllCnt(), birthOrderCntResult.getBirthCntHb())));
+            Double birthRate = DataFormatUtils.rateDouble(birthOrderCntResult.getBirthCnt(), birthOrderCntResult.getAllCnt());
+            Double bhRate = DataFormatUtils.rateDouble(birthOrderCntResult.getBirthCntHb(), birthOrderCntResult.getAllCntHb());
+            consume.setBirthHb(DataFormatUtils.divide(birthRate, bhRate));
         }
         return RestResponse.success(consume);
     }