diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 2ce0312..a2c929a 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -89,7 +89,6 @@ public class PatientsService { public List queryPatient(PatientsQuery patientsQuery) { MongoQuery query = patientsQuery.convertToQuery(); - System.out.println(query.convertToMongoQuery().toString()); if (StringUtils.isNotEmpty(patientsQuery.getNeed())) { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 8bf4a24..faad975 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -805,15 +805,15 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != firstCheckId) { condition = condition.and("firstCheckId", firstCheckId, MongoOper.IS); } - if(null!=prodDoctor){ + + if(null!= prodDoctor){ if("是".equals(prodDoctor)){ - condition=condition.and("prodDoctor",null,MongoOper.NE); + condition=condition.and("firstCheckId",null,MongoOper.NE); }else { - condition=condition.and("prodDoctor",null,MongoOper.IS); + condition=condition.and("firstCheckId",null,MongoOper.IS); } } - Criteria c1 = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 41efa5f..66d32ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -2455,8 +2455,10 @@ public class PatientFacade extends BaseServiceImpl { PatientManagerResult patientManagerResult = new PatientManagerResult(); String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); PatientsQuery patientsQuery = new PatientsQuery(); + if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){ + patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor()); + } patientsQuery.setScreening(patientManagerRequest.getScreening()); - patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor()); patientsQuery.setYyzyfmHospitalId(patientManagerRequest.getYyzyfmHospitalId()); @@ -2532,7 +2534,6 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setQueryNo(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo()); List patientsList = patientsService.queryPatient(patientsQuery); - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); List patientManagerQueryModelList = new ArrayList <>(); if (CollectionUtils.isNotEmpty(patientsList)) { for (Patients patients : patientsList) { @@ -2577,8 +2578,8 @@ public class PatientFacade extends BaseServiceImpl { System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor()); } } - //滦平定制 - if ("2100001377".equals(hospitalId)) { + //滦平定制,围场也需要。初诊时间和初诊医生字段展示。后期其它地区如果需要在这里添加医院id,如果整体变成模块化放开判断即可 + if ("2100001377".equals(hospitalId)||"2100001452".equals(hospitalId)) { //初诊 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId());