diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 6d6df43..57b3dc8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -16,6 +16,7 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.RemoteFacade; import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest; +import com.lyms.platform.operate.web.request.WomanBookArchiveRequest; import com.lyms.platform.permission.service.AssistBuildService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.ArchiveDataQuery; @@ -290,8 +291,10 @@ public class RemoteController extends BaseController { @ResponseBody @RequestMapping(value = "/queryWomanBookArchiveList",method = RequestMethod.GET) - public BaseResponse getWomanBookArchiveList(HttpServletResponse response, - @JsonAlias PreEugenicsBaseListRequest param) { + @TokenRequired + public BaseResponse getWomanBookArchiveList(HttpServletRequest request, + @JsonAlias WomanBookArchiveRequest param) { + String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); Query query = new Query(); String createTime = param.getCreateTime(); @@ -304,6 +307,17 @@ public class RemoteController extends BaseController { query.addCriteria(Criteria.where("created").gte(start).lte(end)); } + if(param.getType() != null) + { + query.addCriteria(Criteria.where("data.type").is(param.getType())); + } + + if(param.getCardNo() != null) + { + query.addCriteria(Criteria.where("cardNo").is(param.getCardNo())); + + } + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); query.with(new Sort(Sort.Direction.DESC, "created")); long count = mongoTemplate.count(query, WomanArchive.class); param.mysqlBuild((int) count); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomanBookArchiveRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomanBookArchiveRequest.java new file mode 100644 index 0000000..f56f90f --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomanBookArchiveRequest.java @@ -0,0 +1,33 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.dao.BaseQuery; + +public class WomanBookArchiveRequest extends BaseQuery { + private String createTime;//预约时间 + private String cardNo;//身份证号 + private String type;//检查类型 + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +}