新版统计

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -17,6 +17,7 @@ import com.yihu.jw.es.util.SaveModel;
import com.yihu.jw.evaluate.score.service.BaseEvaluateScoreService;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.restmodel.hospital.statistics.ScreenQvo;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
@@ -5889,6 +5890,14 @@ public class StatisticsEsService {
            if (SaveModel.doctorLevel.equalsIgnoreCase(lowLevel)) {
                map.put("code",saveModel.getDoctor());
                map.put("name", saveModel.getDoctorName());
                BaseDoctorDO doctorDO = doctorDao.findByIdAndDel(saveModel.getDoctor());
                if (doctorDO!=null){
                    map.put("doctor",doctorDO);
                }
                List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(saveModel.getDoctor());
                if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
                    map.put("doctorHospital",doctorHospitalDOS);
                }
            } else if (SaveModel.deptLevel.equalsIgnoreCase(lowLevel)) {
                map.put("code",saveModel.getDept());
                map.put("name", saveModel.getDeptName());