jiangjiazhi / regional-platform

Commit b66e8603660850b7f6c0c31f15a1c48fed658bd0

Authored by liquanyu about 3 years ago

Exists in master and in 6 other branches

婚检

Showing 2 changed files with 49 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/WomanBookArchiveRequest.java

...	...	@@ -16,6 +16,7 @@
16	16	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
17	17	import com.lyms.platform.operate.web.facade.RemoteFacade;
18	18	import com.lyms.platform.operate.web.request.PreEugenicsBaseListRequest;
	19	+import com.lyms.platform.operate.web.request.WomanBookArchiveRequest;
19	20	import com.lyms.platform.permission.service.AssistBuildService;
20	21	import com.lyms.platform.pojo.*;
21	22	import com.lyms.platform.query.ArchiveDataQuery;
...	...	@@ -290,8 +291,10 @@
290	291
291	292	@ResponseBody
292	293	@RequestMapping(value = "/queryWomanBookArchiveList",method = RequestMethod.GET)
293		- public BaseResponse getWomanBookArchiveList(HttpServletResponse response,
294		- @JsonAlias PreEugenicsBaseListRequest param) {
	294	+ @TokenRequired
	295	+ public BaseResponse getWomanBookArchiveList(HttpServletRequest request,
	296	+ @JsonAlias WomanBookArchiveRequest param) {
	297	+ String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
295	298	Query query = new Query();
296	299
297	300	String createTime = param.getCreateTime();
...	...	@@ -304,6 +307,17 @@
304	307	query.addCriteria(Criteria.where("created").gte(start).lte(end));
305	308	}
306	309
	310	+ if(param.getType() != null)
	311	+ {
	312	+ query.addCriteria(Criteria.where("data.type").is(param.getType()));
	313	+ }
	314	+
	315	+ if(param.getCardNo() != null)
	316	+ {
	317	+ query.addCriteria(Criteria.where("cardNo").is(param.getCardNo()));
	318	+
	319	+ }
	320	+ query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
307	321	query.with(new Sort(Sort.Direction.DESC, "created"));
308	322	long count = mongoTemplate.count(query, WomanArchive.class);
309	323	param.mysqlBuild((int) count);

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+import com.lyms.platform.common.dao.BaseQuery;
	4	+
	5	+public class WomanBookArchiveRequest extends BaseQuery {
	6	+ private String createTime;//预约时间
	7	+ private String cardNo;//身份证号
	8	+ private String type;//检查类型
	9	+
	10	+ public String getCreateTime() {
	11	+ return createTime;
	12	+ }
	13	+
	14	+ public void setCreateTime(String createTime) {
	15	+ this.createTime = createTime;
	16	+ }
	17	+
	18	+ public String getCardNo() {
	19	+ return cardNo;
	20	+ }
	21	+
	22	+ public void setCardNo(String cardNo) {
	23	+ this.cardNo = cardNo;
	24	+ }
	25	+
	26	+ public String getType() {
	27	+ return type;
	28	+ }
	29	+
	30	+ public void setType(String type) {
	31	+ this.type = type;
	32	+ }
	33	+}