|
|
@ -247,11 +247,11 @@ public class StatisticsEsService {
|
|
|
//协同门诊
|
|
|
List<SaveModel> syngySaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "14", SaveModel.timeLevel_ZL, "12", null, level2_type);
|
|
|
//图文复诊
|
|
|
List<SaveModel> topicSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "12", SaveModel.timeLevel_ZL, "9", null, level2_type);
|
|
|
List<SaveModel> topicSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "5", SaveModel.timeLevel_ZL, "9", null, level2_type);
|
|
|
///视频复诊
|
|
|
List<SaveModel> vedioSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "16", SaveModel.timeLevel_ZL, "16", null, level2_type);
|
|
|
///图文咨询
|
|
|
List<SaveModel> twzxSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "12", SaveModel.timeLevel_ZL, "1", null, level2_type);
|
|
|
List<SaveModel> twzxSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "5", SaveModel.timeLevel_ZL, "1", null, level2_type);
|
|
|
///视频咨询
|
|
|
List<SaveModel> spzxSaveModels = elasticsearchUtil.findDateQuotaLevel1(startDate, endDate, area, level, "16", SaveModel.timeLevel_ZL, "17", null, level2_type);
|
|
|
|
|
|
@ -287,55 +287,7 @@ public class StatisticsEsService {
|
|
|
Double vedioZJ = 0.0;
|
|
|
if (index.equalsIgnoreCase("3")) {
|
|
|
specialist = 0.0;
|
|
|
}/*else if (index.equalsIgnoreCase("5")){
|
|
|
for (SaveModel saveModel:specialistSaveModels){
|
|
|
if (level2_type.equals(SaveModel.OrgLevel)){
|
|
|
if (StringUtils.isNoneBlank(saveModel.getHospital())&&code.equalsIgnoreCase(saveModel.getHospital())){
|
|
|
jsonObject.put("code",code);
|
|
|
jsonObject.put("name",saveModel.getHospitalName());
|
|
|
jsonObject.put("specialist",saveModel.getResult1());
|
|
|
specialist = saveModel.getResult1();
|
|
|
break;
|
|
|
}
|
|
|
}else if (level2_type.equals(SaveModel.deptLevel)){
|
|
|
if (StringUtils.isNoneBlank(saveModel.getDept())&&code.equalsIgnoreCase(saveModel.getDept())){
|
|
|
jsonObject.put("code",code);
|
|
|
jsonObject.put("name",saveModel.getDeptName());
|
|
|
jsonObject.put("specialist",saveModel.getResult1());
|
|
|
specialist = saveModel.getResult1();
|
|
|
break;
|
|
|
}
|
|
|
}else if (level2_type.equals(SaveModel.doctorLevel)){
|
|
|
if (StringUtils.isNoneBlank(saveModel.getDoctor())&&code.equalsIgnoreCase(saveModel.getDoctor())){
|
|
|
|
|
|
if (level==6){
|
|
|
List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(area);
|
|
|
if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
|
|
|
BaseDoctorHospitalDO doctorHospitalDO = doctorHospitalDOS.get(0);
|
|
|
jsonObject.put("code",doctorHospitalDO.getDeptCode());
|
|
|
jsonObject.put("name",doctorHospitalDO.getDeptName());
|
|
|
}
|
|
|
}else {
|
|
|
DictHospitalDeptDO dictHospitalDeptDO = hospitalDeptDao.findByCode(area);
|
|
|
jsonObject.put("code",area);
|
|
|
jsonObject.put("name",dictHospitalDeptDO.getName());
|
|
|
}
|
|
|
|
|
|
jsonObject.put("doctorCode",code);
|
|
|
BaseDoctorDO doctorDO = doctorDao.findByIdAndDel(code);
|
|
|
if (doctorDO!=null){
|
|
|
jsonObject.put("doctorJob",doctorDO.getJobTitleName());
|
|
|
}else {
|
|
|
jsonObject.put("doctorJob",null);
|
|
|
}
|
|
|
jsonObject.put("doctorName",saveModel.getDoctorName());
|
|
|
jsonObject.put("specialist",saveModel.getResult1());
|
|
|
specialist = saveModel.getResult1();
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}*/
|
|
|
}
|
|
|
|
|
|
for (SaveModel saveModel : syngySaveModels) {
|
|
|
if (level2_type.equals(SaveModel.OrgLevel)) {
|
|
|
@ -677,60 +629,7 @@ public class StatisticsEsService {
|
|
|
specialist = 0.0;
|
|
|
jsonObject.put("specialist", specialist);
|
|
|
} else if (index.equalsIgnoreCase("5")) {
|
|
|
/* for (SaveModel saveModel:specialistSaveModels){
|
|
|
if (level2_type.equals(SaveModel.OrgLevel)){
|
|
|
if (StringUtils.isNoneBlank(saveModel.getHospital())&&code.equalsIgnoreCase(saveModel.getHospital())){
|
|
|
jsonObject.put("code",code);
|
|
|
jsonObject.put("name",saveModel.getHospitalName());
|
|
|
jsonObject.put("specialist",decimalFormat.format(saveModel.getResult1()));
|
|
|
specialist = saveModel.getResult1();
|
|
|
break;
|
|
|
}
|
|
|
}else if (level2_type.equals(SaveModel.deptLevel)){
|
|
|
if (StringUtils.isNoneBlank(saveModel.getDept())&&code.equalsIgnoreCase(saveModel.getDept())){
|
|
|
jsonObject.put("code",code);
|
|
|
jsonObject.put("name",saveModel.getDeptName());
|
|
|
jsonObject.put("specialist",decimalFormat.format(saveModel.getResult1()));
|
|
|
specialist = saveModel.getResult1();
|
|
|
break;
|
|
|
}
|
|
|
}else if (level2_type.equals(SaveModel.doctorLevel)){
|
|
|
if (StringUtils.isNoneBlank(saveModel.getDoctor())&&code.equalsIgnoreCase(saveModel.getDoctor())){
|
|
|
|
|
|
if (level==6){
|
|
|
List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(area);
|
|
|
if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
|
|
|
BaseDoctorHospitalDO doctorHospitalDO = doctorHospitalDOS.get(0);
|
|
|
jsonObject.put("code",doctorHospitalDO.getDeptCode());
|
|
|
jsonObject.put("name",doctorHospitalDO.getDeptName());
|
|
|
}
|
|
|
}else if (level==4){
|
|
|
BaseOrgDO orgDO = orgDao.findByCode(area);
|
|
|
jsonObject.put("code",area);
|
|
|
jsonObject.put("name",orgDO.getName());
|
|
|
}else if (level==2){
|
|
|
jsonObject.put("code",area);
|
|
|
jsonObject.put("name","厦门市");
|
|
|
}else {
|
|
|
DictHospitalDeptDO dictHospitalDeptDO = hospitalDeptDao.findByCode(area);
|
|
|
jsonObject.put("code",area);
|
|
|
jsonObject.put("name",dictHospitalDeptDO.getName());
|
|
|
}
|
|
|
|
|
|
jsonObject.put("doctorCode",code);
|
|
|
BaseDoctorDO doctorDO = doctorDao.findByIdAndDel(code);
|
|
|
if (doctorDO!=null){
|
|
|
jsonObject.put("doctorJob",doctorDO.getJobTitleName());
|
|
|
}else {
|
|
|
jsonObject.put("doctorJob",null);
|
|
|
}
|
|
|
jsonObject.put("doctorName",saveModel.getDoctorName());
|
|
|
jsonObject.put("specialist",decimalFormat.format(saveModel.getResult1()));
|
|
|
specialist = saveModel.getResult1();
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
}*/
|
|
|
}
|
|
|
|
|
|
for (SaveModel saveModel : syngySaveModels) {
|
|
|
@ -6808,11 +6707,11 @@ public class StatisticsEsService {
|
|
|
|
|
|
//---------------------【处方量】------------------------------------
|
|
|
|
|
|
List<SaveModel> cf_model01 = elasticsearchUtil.findListDateQuotaLevel1(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "2", SaveModel.timeLevel_ZL, null, null);//开方量
|
|
|
List<SaveModel> cf_model01 = elasticsearchUtil.findListDateQuotaLevel1(qvo.getStartDate(), qvo.getEndDate(), qvo.getArea(), qvo.getLevel(), "20", SaveModel.timeLevel_ZL, null, null);//开方量
|
|
|
//上个周期
|
|
|
List<SaveModel> cf_model02 = elasticsearchUtil.findListDateQuotaLevel1(period[0], period[1], qvo.getArea(), qvo.getLevel(), "2", SaveModel.timeLevel_ZL, null, null);//开方量
|
|
|
List<SaveModel> cf_model02 = elasticsearchUtil.findListDateQuotaLevel1(period[0], period[1], qvo.getArea(), qvo.getLevel(), "20", SaveModel.timeLevel_ZL, null, null);//开方量
|
|
|
//去年同期时间
|
|
|
List<SaveModel> cf_model03 = elasticsearchUtil.findListDateQuotaLevel1(periodYear[0], periodYear[1], qvo.getArea(), qvo.getLevel(), "2", SaveModel.timeLevel_ZL, null, null);//开方量
|
|
|
List<SaveModel> cf_model03 = elasticsearchUtil.findListDateQuotaLevel1(periodYear[0], periodYear[1], qvo.getArea(), qvo.getLevel(), "20", SaveModel.timeLevel_ZL, null, null);//开方量
|
|
|
|
|
|
//---------------------【接诊量】------------------------------------
|
|
|
//接诊量-已接诊
|
