Commit f6351cc71d3f06abb07cf8f8ab30c42d8c16cd79
Exists in
master
and in
7 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
View file @
f6351cc
| ... | ... | @@ -352,6 +352,10 @@ |
| 352 | 352 | @Override |
| 353 | 353 | public MongoQuery convertToQuery() { |
| 354 | 354 | MongoCondition condition = MongoCondition.newInstance(); |
| 355 | + | |
| 356 | + if (null != pid) { | |
| 357 | + condition = condition.and("pid", pid, MongoOper.IS); | |
| 358 | + } | |
| 355 | 359 | if (null != parentId) { |
| 356 | 360 | condition = condition.and("parentId", parentId, MongoOper.IS); |
| 357 | 361 | } |
| ... | ... | @@ -416,9 +420,7 @@ |
| 416 | 420 | condition = condition.and("hospitalId", hospitalList, MongoOper.IN); |
| 417 | 421 | } |
| 418 | 422 | |
| 419 | - if (null != pid) { | |
| 420 | - condition = condition.and("pid", pid, MongoOper.IS); | |
| 421 | - } | |
| 423 | + | |
| 422 | 424 | |
| 423 | 425 | Criteria c = null; |
| 424 | 426 | if (null != buildTimeStart) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
f6351cc
| ... | ... | @@ -214,8 +214,6 @@ |
| 214 | 214 | List<AntExManagerResult> data = new ArrayList<>(); |
| 215 | 215 | List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery); |
| 216 | 216 | if (CollectionUtils.isNotEmpty(antExRecordModelList)) { |
| 217 | - AntExChuQuery antExChuQuery = new AntExChuQuery(); | |
| 218 | - AntExQuery antExQuery = new AntExQuery(); | |
| 219 | 217 | for (AntExRecordModel e : antExRecordModelList) { |
| 220 | 218 | AntExManagerResult antExManagerResult = new AntExManagerResult(); |
| 221 | 219 | antExManagerResult.convertToResult(e); |
| ... | ... | @@ -232,7 +230,6 @@ |
| 232 | 230 | antExManagerResult.setAddr(CommonsHelper.getResidence(e.getProvinceRegisterId(), e.getCityRegisterId(), e.getAreaRegisterId(), e.getStreetRegisterId(), e.getAddressRegister(), basicConfigService)); |
| 233 | 231 | } |
| 234 | 232 | |
| 235 | - | |
| 236 | 233 | //登记人 |
| 237 | 234 | if (org.apache.commons.lang.StringUtils.isNotEmpty(e.getBuildDoctor())) { |
| 238 | 235 | if (NumberUtils.isNumber(e.getBuildDoctor())) { |
| ... | ... | @@ -260,16 +257,6 @@ |
| 260 | 257 | } |
| 261 | 258 | } |
| 262 | 259 | |
| 263 | - antExQuery.setPid(e.getPid()); | |
| 264 | - antExQuery.setYn(YnEnums.YES.getId()); | |
| 265 | - antExQuery.setHospitalId(null); | |
| 266 | - antExQuery.setStart(e.getCheckTime()); | |
| 267 | - antExChuQuery.setPid(e.getPid()); | |
| 268 | - antExChuQuery.setYn(YnEnums.YES.getId()); | |
| 269 | - antExChuQuery.setHospitalId(null); | |
| 270 | - antExChuQuery.setStart(e.getCheckTime()); | |
| 271 | - | |
| 272 | - | |
| 273 | 260 | AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); |
| 274 | 261 | antExRecordQuery1.setCheckTimeEnd(e.getCheckTime()); |
| 275 | 262 | antExRecordQuery1.setPid(e.getPid()); |
| ... | ... | @@ -278,15 +265,7 @@ |
| 278 | 265 | //本院低次 |
| 279 | 266 | int dichi = recordService.count(antExRecordQuery1); |
| 280 | 267 | antExRecordQuery1.setHospitalId(null); |
| 281 | - /* int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); | |
| 282 | - antExChuQuery.setHospitalId(null); | |
| 283 | - int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery()); | |
| 284 | - antExQuery.setHospitalId(hospital); | |
| 285 | - //本院的复诊记录 | |
| 286 | - int chi = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); | |
| 287 | - antExChuQuery.setHospitalId(hospital); | |
| 288 | - //本院的初诊记录 | |
| 289 | - int chb = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());*/ | |
| 268 | + | |
| 290 | 269 | antExManagerResult.settTimes(recordService.count(antExRecordQuery1)); |
| 291 | 270 | antExManagerResult.setChTimes(dichi); |
| 292 | 271 | //高危因素 |