diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 754cc5e..9f06ea2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -52,8 +52,17 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String buildDoctor; private String enable; + private String enableNot; private String source; + public String getEnableNot() { + return enableNot; + } + + public void setEnableNot(String enableNot) { + this.enableNot = enableNot; + } + public String getSource() { return source; } @@ -585,6 +594,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("dueType", dueType, MongoOper.IS); } + if (!StringUtils.isEmpty(enableNot)) { + condition = condition.and("enable", enableNot, MongoOper.NE); + } + if (null != hospitalIdList) { condition = condition.and("hospitalId", hospitalIdList, MongoOper.IN); }else if (null != hospitalId) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 0da1f14..adca97e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -57,6 +57,7 @@ public class BabyStatisticsManagerFacade { babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[0]); babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[1]); } + babyModelQuery.setEnableNot("2"); String hospitalId; try { hospitalId = autoMatchFacade.getHospitalId(babyStatisticsManagerBuildDoctorGroupRequest.getOperatorId()); @@ -74,14 +75,20 @@ public class BabyStatisticsManagerFacade { BabyStatisticsManagerBuildDoctorGroupQueryModel babyStatisticsManagerBuildDoctorGroupQueryModel = new BabyStatisticsManagerBuildDoctorGroupQueryModel(); String buildDoctorName; try { - buildDoctorName = usersService.getUsers(Integer.valueOf(hashMap.get("_id").toString())).getName(); + if ("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29".equals(hashMap.get("_id").toString())) { + buildDoctorName = "产科病房"; + } else { + buildDoctorName = usersService.getUsers(Integer.valueOf(hashMap.get("_id").toString())).getName(); + } } catch (Exception e) { - buildDoctorName = "-"; + buildDoctorName = null; + } + if (StringUtils.isNotEmpty(buildDoctorName)) { + babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorName(buildDoctorName); + babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorId(hashMap.get("_id") == null ? null : hashMap.get("_id").toString()); + babyStatisticsManagerBuildDoctorGroupQueryModel.setCount(hashMap.get("count").toString()); + babyStatisticsManagerBuildDoctorGroupQueryModelList.add(babyStatisticsManagerBuildDoctorGroupQueryModel); } - babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorName(buildDoctorName); - babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorId(hashMap.get("_id") == null ? null : hashMap.get("_id").toString()); - babyStatisticsManagerBuildDoctorGroupQueryModel.setCount(hashMap.get("count").toString()); - babyStatisticsManagerBuildDoctorGroupQueryModelList.add(babyStatisticsManagerBuildDoctorGroupQueryModel); } } @@ -112,12 +119,12 @@ public class BabyStatisticsManagerFacade { }); // 干掉空名字医生 - Iterator iterator = babyStatisticsManagerBuildDoctorGroupQueryModelList.iterator(); - while (iterator.hasNext()) { - if (("-").equals(iterator.next().getBuildDoctorName())) { - iterator.remove(); - } - } + // Iterator iterator = babyStatisticsManagerBuildDoctorGroupQueryModelList.iterator(); + // while (iterator.hasNext()) { + // if (("-").equals(iterator.next().getBuildDoctorName())) { + // iterator.remove(); + // } + // } babyStatisticsManagerBuildDoctorGroupResult.setData(babyStatisticsManagerBuildDoctorGroupQueryModelList); babyStatisticsManagerBuildDoctorGroupResult.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -149,6 +156,7 @@ public class BabyStatisticsManagerFacade { return babyStatisticsManagerBuildDoctorListResult; } babyModelQuery.setHospitalId(hospitalId); + babyModelQuery.setEnableNot("2"); List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); List babyStatisticsManagerBuildDoctorListQueryModelList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(babyModelList)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java index b251888..05c3c51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java @@ -70,6 +70,7 @@ public class PredictedStatisticsFacade { patientsQuery.setDueDateEnd(endDate); patientsQuery.setNeed(YnEnums.YES.name()); patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setNotEnable("2"); patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId())); List typeList = new ArrayList<>(); typeList.add(1); @@ -134,6 +135,7 @@ public class PredictedStatisticsFacade { Date endDate = DateUtil.getMonthEndTime(temp); patientsQuery.setDueDateStart(startDate); patientsQuery.setDueDateEnd(endDate); + patientsQuery.setNotEnable("2"); int count = patientsService.queryPatientCount(patientsQuery); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM"); String dateStr = simpleDateFormat.format(new Date());