diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index 4799323..72d76e9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -108,6 +108,7 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private List fmHospitalList; private String fsHospital; private String fsHospitalId; + private boolean isQueryFsHospitalId; /** * 预约联系结果(1-成功、2-失败) */ @@ -183,6 +184,14 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery private String areaZJId; private String streetZJId; + public Boolean getIsQueryFsHospitalId() { + return isQueryFsHospitalId; + } + + public void setIsQueryFsHospitalId(Boolean isQueryFsHospitalId) { + this.isQueryFsHospitalId = isQueryFsHospitalId; + } + public String getProvinceZJId() { return provinceZJId; } @@ -419,9 +428,16 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery } } if (null != fsHospitalId) { - MongoCondition con1 = MongoCondition.newInstance("fsHospital", fsHospitalId, MongoOper.IS); - MongoCondition con2 = MongoCondition.newInstance("fsHospital", false, MongoOper.EXISTS); - condition.orCondition(con1, con2); + if (isQueryFsHospitalId) + { + condition.and("fsHospital", fsHospitalId, MongoOper.IS); + } + else + { + MongoCondition con1 = MongoCondition.newInstance("fsHospital", fsHospitalId, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("fsHospital", false, MongoOper.EXISTS); + condition.orCondition(con1, con2); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 21e66bf..2eca5db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1881,17 +1881,16 @@ public class MatDeliverFacade { // 访视列表无需加上分娩医院,因此注释 //matDeliverQuery.setFmHospitalList(hospitalList); + + matDeliverQuery.setFsHospitalId(hospitalId); if (StringUtils.isNotEmpty(matdeliverFollowRequest.getIsArea())) { if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { + matDeliverQuery.setIsQueryFsHospitalId(true); matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); } } - else - { - matDeliverQuery.setFsHospitalId(hospitalId); - } matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult());