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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsAllService.java

@@ -361,8 +361,16 @@ public class StatisticsAllService extends BaseService {
        DecimalFormat df = new DecimalFormat("0.0000");
        json.put("sign", total);
        json.put("signRate", df.format((total * 1.0000) / num));
        json.put("signTaskRate", df.format((total * 1.0000) / taskNum));
        JSONObject signRate = new JSONObject();
        signRate.put("sign", total);
        signRate.put("people", num);
        signRate.put("rate", df.format((total * 1.0000) / num));
        json.put("signRate",signRate);
        JSONObject signTaskRate = new JSONObject();
        signTaskRate.put("sign", total);
        signTaskRate.put("people", taskNum);
        signTaskRate.put("rate", df.format((total * 1.0000) / taskNum));
        json.put("signTaskRate",signTaskRate);
        return json;
    }
@@ -442,8 +450,8 @@ public class StatisticsAllService extends BaseService {
                                num = peopleNum.getInt("gxyNum");
                                taskNum = peopleNum.getInt("gxyTaskNum");
                            } else if (lowCode.equals("5")) {
                                num = peopleNum.getInt("gxyNum");
                                taskNum = peopleNum.getInt("gxyTaskNum");
                                num = peopleNum.getInt("tnbNum");
                                taskNum = peopleNum.getInt("tnbTaskNum");
                            }
                            map.put("rate", df.format(((long) map.get("amount") * 1.0000) / num * 100));
                            map.put("taskRate", df.format(((long) map.get("amount") * 1.0000) / taskNum * 100));
@@ -1464,7 +1472,7 @@ public class StatisticsAllService extends BaseService {
                    } else if (lowCode.equals("4")) {
                        taskNum = peopleNum.getInt("gxyTaskNum");
                    } else if (lowCode.equals("5")) {
                        taskNum = peopleNum.getInt("gxyTaskNum");
                        taskNum = peopleNum.getInt("tnbTaskNum");
                    }
                }
            }