diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java index ef3f345..9235b69 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java @@ -5,9 +5,11 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; +import org.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; +import java.util.List; /** * Created by Administrator on 2016/6/21 0021. @@ -29,6 +31,17 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { private Date gteCreated; private String pid; + //医院id + private List hospitalList; + + public List getHospitalList() { + return hospitalList; + } + + public void setHospitalList(List hospitalList) { + this.hospitalList = hospitalList; + } + public Date getGteCreated() { return gteCreated; } @@ -131,7 +144,9 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { if (null != pid) { condition = condition.and("pid", pid, MongoOper.IS); } - + if(CollectionUtils.isNotEmpty(hospitalList)){ + condition = condition.and("hospitalId", hospitalList, MongoOper.IN); + } Criteria c = null; if (null != start) { c = Criteria.where("checkTime").gte(start); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index ef31865..3b54eea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1764,7 +1764,9 @@ public class AntenatalExaminationFacade { } else { AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setPid(patients.getPid()); - antExChuQuery1.setHospitalId(hospitalId); +// antExChuQuery1.setHospitalId(hospitalId); + antExChuQuery1.setHospitalList(groupsFacade.findGroupHospital(userId,false)); + antExChuQuery1.setYn(YnEnums.YES.getId()); antExChuQuery1.setStart(max); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery1); @@ -1776,7 +1778,8 @@ public class AntenatalExaminationFacade { PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setYn(YnEnums.YES.getId()); patientsQuery1.setPid(patients.getPid()); - patientsQuery1.setHospitalId(hospitalId); +// patientsQuery1.setHospitalId(hospitalId); + patientsQuery1.setHospitalList(groupsFacade.findGroupHospital(userId,false)); List patientses = patientsService.queryPatient(patientsQuery1); if (CollectionUtils.isNotEmpty(patientses)) {