|
|
@@ -52,11 +52,11 @@ public class ConsoleFacade {
|
|
|
Date date = new Date();
|
|
|
String year = DateUtil.getYear(date);
|
|
|
int month = DateUtil.getMonth(date);
|
|
|
- String startDate = year + "-" + month + "-01";
|
|
|
+ String startDate = year + "-" + month + "-1";
|
|
|
QueryWrapper<BehospitalInfo> behospitalInfoQueryWrapper = new QueryWrapper<>();
|
|
|
behospitalInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("hospital_id", hospitalId)
|
|
|
- .gt("leave_hospital_date", startDate);
|
|
|
+ .ge("leave_hospital_date", startDate);
|
|
|
List<BehospitalInfo> behospitalInfoList = behospitalInfoFacade.list(behospitalInfoQueryWrapper);
|
|
|
if (ListUtil.isNotEmpty(behospitalInfoList)) {
|
|
|
//本月病历数
|
|
|
@@ -66,7 +66,7 @@ public class ConsoleFacade {
|
|
|
QueryWrapper<QcresultInfo> qcresultInfoQueryWrapper = new QueryWrapper<>();
|
|
|
qcresultInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("hospital_id", hospitalId)
|
|
|
- .gt("gmt_create", startDate);
|
|
|
+ .ge("gmt_create", startDate);
|
|
|
List<QcresultInfo> qcresultInfoList = qcresultInfoFacade.list(qcresultInfoQueryWrapper);
|
|
|
if (ListUtil.isNotEmpty(qcresultInfoList)) {
|
|
|
retMap.put("本月质控数-人工", qcresultInfoList
|
gaodm