Prechádzať zdrojové kódy

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

chenweida 8 rokov pred
rodič
commit
9d6130e978

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

@ -4432,7 +4432,7 @@ public class StatisticsService extends BaseService {
            return null;
        }
        result.put("resultList", getCoutList(level,rely, total, onRely));
        result.put("resultList", getCoutList(Integer.valueOf(lowlevel),rely, total, onRely));
        return result;
    }

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

@ -659,6 +659,9 @@ public class StatisticsController extends BaseController {
                                              @RequestParam(required = false) String lowlevel,
                                              @RequestParam(required = false) String year) {
        try {
            if (org.springframework.util.StringUtils.isEmpty(lowlevel)){
                lowlevel=level-1+"";
            }
            JSONObject data = null;
            if (Constant.getNowYear().equals(year)) {
                data = statisticsService.getConsultingStatisticsList(level, area, lowlevel);