|
@ -5968,14 +5968,14 @@ public class StatisticsEsService {
|
|
|
JSONObject result = new JSONObject();
|
|
|
|
|
|
if (qvo.getFlag() == 1) {
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay());
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay());
|
|
|
} else if (qvo.getFlag() == 2) {
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6) + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort());
|
|
|
} else if (qvo.getFlag() == 3) {
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime());
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime());
|
|
|
}
|
|
|
|
|
|
// 计算上一个周期 开始时间period[0] 、结束时间period[1]
|
|
@ -6090,14 +6090,14 @@ public class StatisticsEsService {
|
|
|
*/
|
|
|
public JSONObject getKindsConsultCount(ScreenQvo qvo) throws Exception {
|
|
|
if (qvo.getFlag() == 1) {
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay());
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay());
|
|
|
} else if (qvo.getFlag() == 2) {
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6) + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort());
|
|
|
} else if (qvo.getFlag() == 3) {
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime());
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime());
|
|
|
}
|
|
|
|
|
|
//专家咨询数量 = 图文咨询 + 视频咨询
|
|
@ -6155,16 +6155,16 @@ public class StatisticsEsService {
|
|
|
JSONObject result = new JSONObject();
|
|
|
if (qvo.getFlag() == 1) {
|
|
|
//本月
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay());
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay());
|
|
|
} else if (qvo.getFlag() == 2) {
|
|
|
//近半年
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6) + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort());
|
|
|
} else if (qvo.getFlag() == 3) {
|
|
|
//全年
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime());
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime());
|
|
|
}
|
|
|
|
|
|
HashMap<String, String> map = new HashMap<>();
|
|
@ -6235,16 +6235,16 @@ public class StatisticsEsService {
|
|
|
public JSONObject getDrugAndExaminationFeeList(ScreenQvo qvo) throws Exception {
|
|
|
if (qvo.getFlag() == 1) {
|
|
|
//本月
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay());
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay());
|
|
|
} else if (qvo.getFlag() == 2) {
|
|
|
//近半年
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6) + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort());
|
|
|
} else if (qvo.getFlag() == 3) {
|
|
|
//全年
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime());
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime());
|
|
|
}
|
|
|
HashMap<String, String> map = new HashMap<>();
|
|
|
JSONObject result = new JSONObject();
|
|
@ -6286,16 +6286,16 @@ public class StatisticsEsService {
|
|
|
JSONObject result = new JSONObject();
|
|
|
if (qvo.getFlag() == 1) {
|
|
|
//本月
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay());
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay());
|
|
|
} else if (qvo.getFlag() == 2) {
|
|
|
//近半年
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6) + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort());
|
|
|
} else if (qvo.getFlag() == 3) {
|
|
|
//全年
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime());
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime());
|
|
|
}
|
|
|
//查科室
|
|
|
if ("4".equals(String.valueOf(qvo.getLevel()))) {
|
|
@ -6392,16 +6392,16 @@ public class StatisticsEsService {
|
|
|
List<Map<String, Object>> resultList = null;
|
|
|
if (qvo.getFlag() == 1) {
|
|
|
//本月
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay());
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay());
|
|
|
} else if (qvo.getFlag() == 2) {
|
|
|
//近半年
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6) + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort());
|
|
|
} else if (qvo.getFlag() == 3) {
|
|
|
//全年
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() );
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime());
|
|
|
}
|
|
|
//查科室
|
|
|
if ("4".equals(String.valueOf(qvo.getLevel()))) {
|
|
@ -6434,16 +6434,16 @@ public class StatisticsEsService {
|
|
|
public List getAllDeptAndDoctorDetails(ScreenQvo qvo) throws Exception {
|
|
|
if (qvo.getFlag() == 1) {
|
|
|
//本月
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getFirstMonthDay());
|
|
|
qvo.setEndDate(DateUtil.getLastMonthDay());
|
|
|
} else if (qvo.getFlag() == 2) {
|
|
|
//近半年
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6) + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
|
|
|
qvo.setEndDate(DateUtil.getStringDateShort());
|
|
|
} else if (qvo.getFlag() == 3) {
|
|
|
//全年
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime() + " 00:00:00");
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime() + " 23:59:59");
|
|
|
qvo.setStartDate(DateUtil.getCurrentYearStartTime());
|
|
|
qvo.setEndDate(DateUtil.getCurrentYearEndTime());
|
|
|
}
|
|
|
//查出所有科室的,在查科室下面的医生的
|
|
|
JSONObject deptObject = getAllHospitalDetails(qvo);//全部科室
|
|
@ -6668,8 +6668,6 @@ public class StatisticsEsService {
|
|
|
String previousStartDate = previousStart.format(DateTimeFormatter.ISO_LOCAL_DATE);
|
|
|
String previousEndDate = previousEnd.format(DateTimeFormatter.ISO_LOCAL_DATE);
|
|
|
// 返回上一个周期的时间段
|
|
|
previousStartDate += " 00:00:00";
|
|
|
previousEndDate += " 23:59:59";
|
|
|
|
|
|
return new String[]{previousStartDate, previousEndDate};
|
|
|
}
|
|
@ -6691,8 +6689,6 @@ public class StatisticsEsService {
|
|
|
// 将日期对象转换为字符串
|
|
|
String previousStartDate = previousStart.format(DateTimeFormatter.ISO_LOCAL_DATE);
|
|
|
String previousEndDate = previousEnd.format(DateTimeFormatter.ISO_LOCAL_DATE);
|
|
|
previousStartDate += " 00:00:00";
|
|
|
previousEndDate += " 23:59:59";
|
|
|
// 返回去年同期的时间段
|
|
|
return new String[]{previousStartDate, previousEndDate};
|
|
|
}
|