jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 195ff6d3d12bd3608570e17aeab9b472c7ba1e60

Authored by hujiaqi
1 parent 22bd3a5f2d
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

enable 病房 高危评分

Showing 3 changed files with 35 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 195ff6d
... ... @@ -52,8 +52,17 @@
52 52 private String buildDoctor;
53 53  
54 54 private String enable;
  55 + private String enableNot;
55 56 private String source;
56 57  
  58 + public String getEnableNot() {
  59 + return enableNot;
  60 + }
  61 +
  62 + public void setEnableNot(String enableNot) {
  63 + this.enableNot = enableNot;
  64 + }
  65 +
57 66 public String getSource() {
58 67 return source;
59 68 }
... ... @@ -583,6 +592,10 @@
583 592  
584 593 if (!StringUtils.isEmpty(dueType)) {
585 594 condition = condition.and("dueType", dueType, MongoOper.IS);
  595 + }
  596 +
  597 + if (!StringUtils.isEmpty(enableNot)) {
  598 + condition = condition.and("enable", enableNot, MongoOper.NE);
586 599 }
587 600  
588 601 if (null != hospitalIdList) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java View file @ 195ff6d
... ... @@ -57,6 +57,7 @@
57 57 babyModelQuery.setBuildDateStart(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[0]);
58 58 babyModelQuery.setBuildDateEnd(DateUtil.getSNDate(babyStatisticsManagerBuildDoctorGroupRequest.getBuildDate())[1]);
59 59 }
  60 + babyModelQuery.setEnableNot("2");
60 61 String hospitalId;
61 62 try {
62 63 hospitalId = autoMatchFacade.getHospitalId(babyStatisticsManagerBuildDoctorGroupRequest.getOperatorId());
63 64  
64 65  
... ... @@ -74,14 +75,20 @@
74 75 BabyStatisticsManagerBuildDoctorGroupQueryModel babyStatisticsManagerBuildDoctorGroupQueryModel = new BabyStatisticsManagerBuildDoctorGroupQueryModel();
75 76 String buildDoctorName;
76 77 try {
77   - buildDoctorName = usersService.getUsers(Integer.valueOf(hashMap.get("_id").toString())).getName();
  78 + if ("a9e5507f-e7da-4ec6-b8db-9a1e4d1b7c29".equals(hashMap.get("_id").toString())) {
  79 + buildDoctorName = "产科病房";
  80 + } else {
  81 + buildDoctorName = usersService.getUsers(Integer.valueOf(hashMap.get("_id").toString())).getName();
  82 + }
78 83 } catch (Exception e) {
79   - buildDoctorName = "-";
  84 + buildDoctorName = null;
80 85 }
81   - babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorName(buildDoctorName);
82   - babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorId(hashMap.get("_id") == null ? null : hashMap.get("_id").toString());
83   - babyStatisticsManagerBuildDoctorGroupQueryModel.setCount(hashMap.get("count").toString());
84   - babyStatisticsManagerBuildDoctorGroupQueryModelList.add(babyStatisticsManagerBuildDoctorGroupQueryModel);
  86 + if (StringUtils.isNotEmpty(buildDoctorName)) {
  87 + babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorName(buildDoctorName);
  88 + babyStatisticsManagerBuildDoctorGroupQueryModel.setBuildDoctorId(hashMap.get("_id") == null ? null : hashMap.get("_id").toString());
  89 + babyStatisticsManagerBuildDoctorGroupQueryModel.setCount(hashMap.get("count").toString());
  90 + babyStatisticsManagerBuildDoctorGroupQueryModelList.add(babyStatisticsManagerBuildDoctorGroupQueryModel);
  91 + }
85 92 }
86 93 }
87 94  
... ... @@ -112,12 +119,12 @@
112 119 });
113 120  
114 121 // 干掉空名字医生
115   - Iterator<BabyStatisticsManagerBuildDoctorGroupQueryModel> iterator = babyStatisticsManagerBuildDoctorGroupQueryModelList.iterator();
116   - while (iterator.hasNext()) {
117   - if (("-").equals(iterator.next().getBuildDoctorName())) {
118   - iterator.remove();
119   - }
120   - }
  122 + // Iterator<BabyStatisticsManagerBuildDoctorGroupQueryModel> iterator = babyStatisticsManagerBuildDoctorGroupQueryModelList.iterator();
  123 + // while (iterator.hasNext()) {
  124 + // if (("-").equals(iterator.next().getBuildDoctorName())) {
  125 + // iterator.remove();
  126 + // }
  127 + // }
121 128  
122 129 babyStatisticsManagerBuildDoctorGroupResult.setData(babyStatisticsManagerBuildDoctorGroupQueryModelList);
123 130 babyStatisticsManagerBuildDoctorGroupResult.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -149,6 +156,7 @@
149 156 return babyStatisticsManagerBuildDoctorListResult;
150 157 }
151 158 babyModelQuery.setHospitalId(hospitalId);
  159 + babyModelQuery.setEnableNot("2");
152 160 List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
153 161 List<BabyStatisticsManagerBuildDoctorListQueryModel> babyStatisticsManagerBuildDoctorListQueryModelList = new ArrayList<>();
154 162 if (CollectionUtils.isNotEmpty(babyModelList)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java View file @ 195ff6d
... ... @@ -70,6 +70,7 @@
70 70 patientsQuery.setDueDateEnd(endDate);
71 71 patientsQuery.setNeed(YnEnums.YES.name());
72 72 patientsQuery.setYn(YnEnums.YES.getId());
  73 + patientsQuery.setNotEnable("2");
73 74 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(predictedStatisticsRequest.getOperatorId()));
74 75 List<Integer> typeList = new ArrayList<>();
75 76 typeList.add(1);
... ... @@ -134,6 +135,7 @@
134 135 Date endDate = DateUtil.getMonthEndTime(temp);
135 136 patientsQuery.setDueDateStart(startDate);
136 137 patientsQuery.setDueDateEnd(endDate);
  138 + patientsQuery.setNotEnable("2");
137 139 int count = patientsService.queryPatientCount(patientsQuery);
138 140 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM");
139 141 String dateStr = simpleDateFormat.format(new Date());