diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java index e6de4e6..b4fc26f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostReviewQuery.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; +import java.util.List; /** * Created by Administrator on 2016/6/28 0028. @@ -15,6 +16,7 @@ import java.util.Date; public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery { private String id; private String parentId; + private List parentIdList; private Integer yn; //创建时间 private Date start; @@ -29,6 +31,14 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery private String hospitalId; + public List getParentIdList() { + return parentIdList; + } + + public void setParentIdList(List parentIdList) { + this.parentIdList = parentIdList; + } + public String getHospitalId() { return hospitalId; } @@ -119,6 +129,9 @@ public class PostReviewQuery extends BaseQuery implements IConvertToNativeQuery if(null!=hospitalId){ mongoCondition=mongoCondition.and("hospitalId",hospitalId,MongoOper.IS); } + if (null != parentIdList) { + mongoCondition = mongoCondition.and("parentId", parentIdList, MongoOper.IN); + } boolean isAddStart = Boolean.FALSE; Criteria c = null; if (null != 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 15aebad..a85451d 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 @@ -1707,8 +1707,8 @@ public class AntenatalExaminationFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setSource(patients.getId()); - patientsQuery.setBuildType(1); + System.out.println("查询条件:"+patientsQuery.convertToQuery().convertToMongoQuery()); List patients1 = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patients1)) { for (Patients ps : patients1) { @@ -1797,11 +1797,7 @@ public class AntenatalExaminationFacade { } else { PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setYn(YnEnums.YES.getId()); - if (patients2 != null) { - postReviewQuery.setParentId(patients2.getId()); - } else { - postReviewQuery.setParentId(patientId); - } + postReviewQuery.setParentIdList(patientIds); //产后复查记录 List reviewModels = postReviewService.findWithList(postReviewQuery); if (CollectionUtils.isNotEmpty(reviewModels)) { @@ -2345,7 +2341,7 @@ public class AntenatalExaminationFacade { patientsQuery.setEnable("2"); } Patients patients = null; - // System.out.println("复诊时查询当前医院是否有隐藏建档条件:" + patientsQuery.convertToQuery().convertToMongoQuery()); + System.out.println("复诊时查询当前医院是否有隐藏建档条件:" + patientsQuery.convertToQuery().convertToMongoQuery()); List list = patientsService.queryPatient1(patientsQuery, "modified"); if (CollectionUtils.isNotEmpty(list)) { return list.get(0);