jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9eb88bcc3b460d557774d6c1e9517dd9d74f9c09

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

update

Showing 2 changed files with 27 additions and 15 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 9eb88bc
... ... @@ -806,6 +806,7 @@
806 806 condition = condition.and("firstCheckId", firstCheckId, MongoOper.IS);
807 807 }
808 808  
  809 + //孕产建档管理 初诊医生 是否
809 810 if(null!= prodDoctor){
810 811 if("是".equals(prodDoctor)){
811 812 condition=condition.and("firstCheckId",null,MongoOper.NE);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 9eb88bc
... ... @@ -2455,9 +2455,12 @@
2455 2455 PatientManagerResult patientManagerResult = new PatientManagerResult();
2456 2456 String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId());
2457 2457 PatientsQuery patientsQuery = new PatientsQuery();
  2458 +
  2459 + //孕产建档管理-初诊医生 是否 条件查询
2458 2460 if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){
2459 2461 patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor());
2460 2462 }
  2463 +
2461 2464 patientsQuery.setScreening(patientManagerRequest.getScreening());
2462 2465  
2463 2466 patientsQuery.setYyzyfmHospitalId(patientManagerRequest.getYyzyfmHospitalId());
2464 2467  
2465 2468  
... ... @@ -2578,25 +2581,33 @@
2578 2581 System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor());
2579 2582 }
2580 2583 }
2581   - //滦平定制,围场也需要。初诊时间和初诊医生字段展示。后期其它地区如果需要在这里添加医院id,如果整体变成模块化放开判断即可
2582   - if ("2100001377".equals(hospitalId)||"2100001452".equals(hospitalId)) {
2583   - //初诊
2584   - AntExChuQuery antExChuQuery = new AntExChuQuery();
2585   - antExChuQuery.setYn(YnEnums.YES.getId());
2586   - antExChuQuery.setHospitalId(hospitalId);
2587   - antExChuQuery.setParentId(patients.getId());
2588   - List <AntExChuModel> antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery());
2589   - if (CollectionUtils.isNotEmpty(antExChuModelList)) {
2590   - AntExChuModel antExChuModel = antExChuModelList.get(0);
2591   - if (StringUtils.isNotEmpty(antExChuModel.getProdDoctor())) {
2592   - Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor()));
  2584 + //初诊时间和初诊医生字段展示,作为模块化
  2585 + if (StringUtils.isNotEmpty(patients.getFirstCheckId())) {
  2586 + Users users = usersService.getUsers(Integer.parseInt(patients.getFirstCheckId()));
2593 2587 if (users != null) {
2594 2588 patientManagerQueryModel.setProdDoctor(users.getName());
2595 2589 }
  2590 + patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime()));
2596 2591 }
2597   - patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
2598   - }
2599   - }
  2592 + //滦平,围场,需求。初诊时间和初诊医生字段展示。
  2593 +// if ("2100001377".equals(hospitalId)||"2100001452".equals(hospitalId)) {
  2594 +// //初诊
  2595 +// AntExChuQuery antExChuQuery = new AntExChuQuery();
  2596 +// antExChuQuery.setYn(YnEnums.YES.getId());
  2597 +// antExChuQuery.setHospitalId(hospitalId);
  2598 +// antExChuQuery.setParentId(patients.getId());
  2599 +// List <AntExChuModel> antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery());
  2600 +// if (CollectionUtils.isNotEmpty(antExChuModelList)) {
  2601 +// AntExChuModel antExChuModel = antExChuModelList.get(0);
  2602 +// if (StringUtils.isNotEmpty(antExChuModel.getProdDoctor())) {
  2603 +// Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor()));
  2604 +// if (users != null) {
  2605 +// patientManagerQueryModel.setProdDoctor(users.getName());
  2606 +// }
  2607 +// }
  2608 +// patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
  2609 +// }
  2610 +// }
2600 2611  
2601 2612 patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor);
2602 2613 patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));