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

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

@@ -2197,7 +2197,7 @@ public class StatisticsService extends BaseService {
                "       WHERE w.czrq>='" + startDate + " 00:00:00' AND w.czrq <='" + endDate + " 23:59:59' AND w.admin_team_code IN( " +
                "       SELECT " +
                "       m.id FROM wlyy_admin_team m " +
                "       WHERE w.org_code ='" + orgcode + "'" +
                "       WHERE m.org_code ='" + orgcode + "'" +
                "       ) " +
                "   GROUP BY w.admin_team_code " +
                "   ORDER BY count DESC " +
@@ -2244,9 +2244,9 @@ public class StatisticsService extends BaseService {
                "  SELECT (@rowNum :=@rowNum + 1) AS rowno,t.reservationCount,t.admin_team_code " +
                "   FROM ( " +
                "   SELECT COUNT(1) AS reservationCount,w.admin_team_code " +
                "   FROM wlyy_patient_reservation  w JOIN wlyy_admin_team t ON w.admin_team_code = t.id " +
                "   FROM wlyy_patient_reservation  w JOIN wlyy_admin_team at ON w.admin_team_code = at.id " +
                "   WHERE w.czrq>='" + startDate + " 00:00:00' AND w.czrq <='" + endDate + " 23:59:59' AND " +
                "   t.org_code ='" + orgcode + "'" +
                "   at.org_code ='" + orgcode + "'" +
                "   AND w.doctor is not null " +
                "   AND w.admin_team_code IS NOT NULL " +
                "   GROUP BY w.admin_team_code " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -3130,6 +3130,7 @@ public class StatisticsESService {
    /**
     * 团队报告--长处方
     * 备注：决定用旧版，先弃用（17-11-23）
     *
     * @param startDate
     * @param endDate

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

@@ -1633,7 +1633,7 @@ public class EsStatisticsController extends BaseController {
                                            @ApiParam(name="endDate", value="开始时间 yyyy-MM-dd") @RequestParam(required = true)String endDate,
                                            @ApiParam(name="adminTeamId", value="团队ID") @RequestParam(required = true)Integer adminTeamId){
        try{
            return write(200, "查询成功", "data", statisticsESService.getPrescriptionTotalCount(startDate,endDate,adminTeamId));
            return write(200, "查询成功", "data", statisticsService.getPrescriptionTotalCount(startDate,endDate,adminTeamId));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");