diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index 435d411..9676172 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; +import java.util.List; /** * 产前筛查 @@ -81,6 +82,15 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { //申请医院 private String applyHospitalId; + private List parentIds; + + public List getParentIds() { + return parentIds; + } + + public void setParentIds(List parentIds) { + this.parentIds = parentIds; + } public String getSieveHospitalId() { return sieveHospitalId; @@ -259,6 +269,11 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (null != parentId) { condition = condition.and("parentId", parentId, MongoOper.IS); } + + if (null != parentIds && parentIds.size() > 0) { + condition = condition.and("parentId", parentIds, MongoOper.IN); + } + if (StringUtils.isNotEmpty(name)) { condition = condition.and("name", name, MongoOper.LIKE); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 95c1185..3686e38 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -843,15 +843,21 @@ public class SieveFacade { public BaseResponse reviceSieve(List parentIds, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - SieveModel sieve = new SieveModel(); - sieve.setHospitalId(hospitalId); - sieve.setReviceStatus(2); if (CollectionUtils.isNotEmpty(parentIds)) { - for (String parentId : parentIds) + SieveQuery query = new SieveQuery(); + query.setParentIds(parentIds); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(hospitalId); + List list = sieveService.queryList(query); + + if (CollectionUtils.isNotEmpty(list)) { - sieve.setParentId(parentId); - sieveService.updateOneChanQianDiaSieve(sieve); + for (SieveModel sieve : list) + { + sieve.setReviceStatus(2); + sieveService.updateOneChanQianDiaSieve(sieve); + } } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");