Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -251,11 +251,9 @@ public class StatisticsController extends BaseController {
                        String amount = "";
                        if (map1.get("code").equals(map2.get("code"))) {
                            amount = map1.get("amount").toString() + "," + map2.get("amount").toString();
                        } else {
                            amount = map1.get("amount").toString() + ",0";
                            map1.put("amount", amount);
                            returnJa.put(map1);
                        }
                        map1.put("amount", amount);
                        returnJa.put(map1);
                    }
                }
            }