fangcheng / regional-platform

Commit 23fe6083d4f0359aca32191ed5c54d831e13eb49

Authored by jiangjiazhi almost 9 years ago

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/FolicAcid.java
platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java

...	...	@@ -16,8 +16,6 @@
16	16	//妇女ID
17	17	private String parentId;
18	18	/* 领取信息 */
19		- //高危因素
20		- private String riskFactors;
21	19	//领取数量
22	20	private String drawCount;
23	21	//孕期类型
24	22
25	23
...	...	@@ -25,15 +23,16 @@
25	23	//孕周
26	24	private String pregnancyWeeks;
27	25	//高危因素
28		- private String hightRisk;
	26	+ private String highRisk;
29	27
30		- /* 院内信息 */
	28	+ /* 发放信息 */
31	29	//发放单位
32	30	private String hospitalId;
33	31	//发放人
34	32	private String operator;
35	33	//领取时间
36		- private String drawTime;
	34	+ private Date drawTime;
	35	+
37	36	//创建时间
38	37	private Date created;
39	38	//修改时间
...	...	@@ -43,6 +42,15 @@
43	42	//有效标识
44	43	private Integer yn;
45	44
	45	+
	46	+ public String getHighRisk() {
	47	+ return highRisk;
	48	+ }
	49	+
	50	+ public void setHighRisk(String highRisk) {
	51	+ this.highRisk = highRisk;
	52	+ }
	53	+
46	54	public Date getCreated() {
47	55	return created;
48	56	}
...	...	@@ -91,14 +99,6 @@
91	99	this.parentId = parentId;
92	100	}
93	101
94		- public String getRiskFactors() {
95		- return riskFactors;
96		- }
97		-
98		- public void setRiskFactors(String riskFactors) {
99		- this.riskFactors = riskFactors;
100		- }
101		-
102	102	public String getDrawCount() {
103	103	return drawCount;
104	104	}
105	105
...	...	@@ -139,11 +139,11 @@
139	139	this.operator = operator;
140	140	}
141	141
142		- public String getDrawTime() {
	142	+ public Date getDrawTime() {
143	143	return drawTime;
144	144	}
145	145
146		- public void setDrawTime(String drawTime) {
	146	+ public void setDrawTime(Date drawTime) {
147	147	this.drawTime = drawTime;
148	148	}
149	149	}

...	...	@@ -2,8 +2,14 @@
2	2
3	3	import com.lyms.platform.common.base.IConvertToNativeQuery;
4	4	import com.lyms.platform.common.dao.BaseQuery;
	5	+import com.lyms.platform.common.dao.operator.MongoCondition;
	6	+import com.lyms.platform.common.dao.operator.MongoOper;
5	7	import com.lyms.platform.common.dao.operator.MongoQuery;
	8	+import org.apache.commons.lang.StringUtils;
	9	+import org.springframework.data.mongodb.core.query.Criteria;
6	10
	11	+import java.util.Date;
	12	+
7	13	/**
8	14	* Created by Administrator on 2016/12/1 0001.
9	15	*/
10	16
11	17
12	18
13	19
...	...	@@ -13,25 +19,72 @@
13	19	//妇女ID
14	20	private String parentId;
15	21	/* 领取信息 */
16		- //领取次数
17		- private String drawNum;
18	22	//领取数量
19	23	private String drawCount;
20	24	//孕期类型
21	25	private Integer pregnancyType;
22	26	//孕周
23	27	private String pregnancyWeeks;
24		- /* 院内信息 */
	28	+ //高危因素
	29	+ private String highRisk;
	30	+
	31	+ /* 发放信息 */
25	32	//发放单位
26	33	private String hospitalId;
27	34	//发放人
28	35	private String operator;
29	36	//领取时间
30		- private String drawTime;
	37	+ private Date drawTimeStart;
	38	+ private Date drawTimeEnd;
31	39
	40	+ //创建时间
	41	+ private Date created;
	42	+ //修改时间
	43	+ private Date modified;
	44	+ //创建人ID
	45	+ private Integer publishId;
	46	+ //有效标识
	47	+ private Integer yn;
	48	+
32	49	@Override
33	50	public MongoQuery convertToQuery() {
34		- return null;
	51	+ MongoCondition condition = MongoCondition.newInstance();
	52	+ if (StringUtils.isNotBlank(id)) {
	53	+ condition = condition.and("id", id, MongoOper.IS);
	54	+ }
	55	+ if (StringUtils.isNotBlank(parentId)) {
	56	+ condition = condition.and("parentId", parentId, MongoOper.IS);
	57	+ }
	58	+ if (StringUtils.isNotBlank(hospitalId)) {
	59	+ condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
	60	+ }
	61	+ if (created!=null) {
	62	+ condition = condition.and("created", created, MongoOper.IS);
	63	+ }
	64	+ if (modified!=null) {
	65	+ condition = condition.and("modified", modified, MongoOper.IS);
	66	+ }
	67	+ if (yn!=null) {
	68	+ condition = condition.and("yn", yn, MongoOper.IS);
	69	+ }
	70	+ if (highRisk!=null) {
	71	+ condition = condition.and("highRisk", highRisk, MongoOper.IS);
	72	+ }
	73	+ Criteria c1 = null;
	74	+ if(null!=drawTimeStart){
	75	+ c1 = Criteria.where("drawTime").gte(drawTimeStart);
	76	+ }
	77	+ if(null!=drawTimeEnd){
	78	+ if (null==c1) {
	79	+ c1 = Criteria.where("drawTime").lte(drawTimeEnd);
	80	+ } else {
	81	+ c1 = c1.lte(drawTimeEnd);
	82	+ }
	83	+ }
	84	+ if (c1!=null) {
	85	+ condition = condition.andCondition(new MongoCondition(c1));
	86	+ }
	87	+ return condition.toMongoQuery();
35	88	}
36	89
37	90	public String getId() {
...	...	@@ -50,14 +103,6 @@
50	103	this.parentId = parentId;
51	104	}
52	105
53		- public String getDrawNum() {
54		- return drawNum;
55		- }
56		-
57		- public void setDrawNum(String drawNum) {
58		- this.drawNum = drawNum;
59		- }
60		-
61	106	public String getDrawCount() {
62	107	return drawCount;
63	108	}
...	...	@@ -82,6 +127,14 @@
82	127	this.pregnancyWeeks = pregnancyWeeks;
83	128	}
84	129
	130	+ public String getHighRisk() {
	131	+ return highRisk;
	132	+ }
	133	+
	134	+ public void setHighRisk(String highRisk) {
	135	+ this.highRisk = highRisk;
	136	+ }
	137	+
85	138	public String getHospitalId() {
86	139	return hospitalId;
87	140	}
88	141
89	142
90	143
...	...	@@ -98,14 +151,52 @@
98	151	this.operator = operator;
99	152	}
100	153
101		- public String getDrawTime() {
102		- return drawTime;
	154	+ public Date getDrawTimeStart() {
	155	+ return drawTimeStart;
103	156	}
104	157
105		- public void setDrawTime(String drawTime) {
106		- this.drawTime = drawTime;
	158	+ public void setDrawTimeStart(Date drawTimeStart) {
	159	+ this.drawTimeStart = drawTimeStart;
107	160	}
108	161
	162	+ public Date getDrawTimeEnd() {
	163	+ return drawTimeEnd;
	164	+ }
109	165
	166	+ public void setDrawTimeEnd(Date drawTimeEnd) {
	167	+ this.drawTimeEnd = drawTimeEnd;
	168	+ }
	169	+
	170	+ public Date getCreated() {
	171	+ return created;
	172	+ }
	173	+
	174	+ public void setCreated(Date created) {
	175	+ this.created = created;
	176	+ }
	177	+
	178	+ public Date getModified() {
	179	+ return modified;
	180	+ }
	181	+
	182	+ public void setModified(Date modified) {
	183	+ this.modified = modified;
	184	+ }
	185	+
	186	+ public Integer getPublishId() {
	187	+ return publishId;
	188	+ }
	189	+
	190	+ public void setPublishId(Integer publishId) {
	191	+ this.publishId = publishId;
	192	+ }
	193	+
	194	+ public Integer getYn() {
	195	+ return yn;
	196	+ }
	197	+
	198	+ public void setYn(Integer yn) {
	199	+ this.yn = yn;
	200	+ }
110	201	}

	1	+package com.lyms.platform.operate.web.controller;
	2	+
	3	+import com.lyms.platform.common.annotation.TokenRequired;
	4	+import com.lyms.platform.common.base.LoginContext;
	5	+import com.lyms.platform.common.result.BaseListResponse;
	6	+import com.lyms.platform.common.result.BaseObjectResponse;
	7	+import com.lyms.platform.common.result.BaseResponse;
	8	+import com.lyms.platform.operate.web.facade.FolicAcidFacade;
	9	+import com.lyms.platform.operate.web.request.FolicAcidAddRequest;
	10	+import com.lyms.platform.operate.web.request.FolicAcidQueryRequest;
	11	+import org.springframework.beans.factory.annotation.Autowired;
	12	+import org.springframework.stereotype.Controller;
	13	+import org.springframework.web.bind.annotation.*;
	14	+
	15	+import javax.servlet.http.HttpServletRequest;
	16	+import javax.validation.Valid;
	17	+
	18	+/**
	19	+ * 叶酸发放接口
	20	+ *
	21	+ * Created by Administrator on 2016/12/1 0001.
	22	+ */
	23	+@Controller
	24	+public class FolicAcidController {
	25	+
	26	+ @Autowired
	27	+ private FolicAcidFacade folicAcidFacade;
	28	+
	29	+ //发放
	30	+ @RequestMapping(value = "/addOrUpdateFolicAcid", method = RequestMethod.POST)
	31	+ @ResponseBody
	32	+// @TokenRequired
	33	+ public BaseResponse addOrUpdateFolicAcid(@RequestBody FolicAcidAddRequest folicAcidAddRequest,
	34	+ HttpServletRequest request) {
	35	+ //获取当前登录用户ID
	36	+// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	37	+
	38	+ return folicAcidFacade.addOrUpdateFolicAcid(folicAcidAddRequest,1);
	39	+ }
	40	+
	41	+ //获取单个发放记录
	42	+ @RequestMapping(value = "/getFolicAcid", method = RequestMethod.GET)
	43	+ @ResponseBody
	44	+ @TokenRequired
	45	+ public BaseObjectResponse getFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
	46	+ HttpServletRequest request) {
	47	+
	48	+ return folicAcidFacade.getFolicAcid(folicAcidQueryRequest);
	49	+ }
	50	+
	51	+ //叶酸发放管理
	52	+ @RequestMapping(value = "/queryFolicAcid", method = RequestMethod.GET)
	53	+ @ResponseBody
	54	+ @TokenRequired
	55	+ public BaseListResponse queryFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest,
	56	+ HttpServletRequest request) {
	57	+
	58	+ return folicAcidFacade.queryFolicAcid(folicAcidQueryRequest);
	59	+ }
	60	+
	61	+}

...	...	@@ -100,5 +100,14 @@
100	100	return residentsArchiveFacade.queryResidentsArchives(residentsArchiveQueryRequest,loginState.getId(),"true");
101	101	}
102	102
	103	+ //返回证件类型
	104	+ @RequestMapping(value = "/getCertificateType", method = RequestMethod.GET)
	105	+ @ResponseBody
	106	+ public BaseResponse queryCardNoType(){
	107	+ return residentsArchiveFacade.queryCardNoType();
	108	+ }
	109	+
	110	+
	111	+
103	112	}

...	...	@@ -1622,13 +1622,14 @@
1622	1622	babyQuery.setCardNo(request.getBcardNo());
1623	1623	babyQuery.setName(request.getName());
1624	1624	babyQuery.setMphone(request.getMphone());
1625		- if (request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null) {
1626		-
1627		- Date currentDate = DateUtil.formatDate(new Date());
	1625	+ Date currentDate = DateUtil.formatDate(new Date());
	1626	+ if (request.getMonthAgeStart() != null) {
1628	1627	Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());
	1628	+ babyQuery.setBirthEnd(start);
	1629	+ }
	1630	+ if(request.getMonthAgeEnd() != null){
1629	1631	Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1);
1630	1632	babyQuery.setBirthStart(end);
1631		- babyQuery.setBirthEnd(start);
1632	1633	}
1633	1634
1634	1635	// if (StringUtils.isNotEmpty(request.getDiagnose()))

	1	+package com.lyms.platform.operate.web.facade;
	2	+
	3	+import com.lyms.platform.biz.service.FolicAcidService;
	4	+import com.lyms.platform.biz.service.ResidentsArchiveService;
	5	+import com.lyms.platform.common.constants.ErrorCodeConstants;
	6	+import com.lyms.platform.common.enums.YnEnums;
	7	+import com.lyms.platform.common.result.BaseListResponse;
	8	+import com.lyms.platform.common.result.BaseObjectResponse;
	9	+import com.lyms.platform.common.result.BaseResponse;
	10	+import com.lyms.platform.operate.web.request.FolicAcidAddRequest;
	11	+import com.lyms.platform.operate.web.request.FolicAcidQueryRequest;
	12	+import com.lyms.platform.permission.model.Organization;
	13	+import com.lyms.platform.permission.model.OrganizationQuery;
	14	+import com.lyms.platform.permission.service.OrganizationService;
	15	+import com.lyms.platform.pojo.FolicAcid;
	16	+import com.lyms.platform.pojo.ResidentsArchiveModel;
	17	+import com.lyms.platform.query.FolicAcidQuery;
	18	+import com.lyms.platform.query.ResidentsArchiveQuery;
	19	+import org.apache.commons.collections.CollectionUtils;
	20	+import org.apache.commons.lang.StringUtils;
	21	+import org.springframework.beans.factory.annotation.Autowired;
	22	+import org.springframework.stereotype.Component;
	23	+
	24	+import java.util.*;
	25	+
	26	+/**
	27	+ * Created by Administrator on 2016/12/5 0005.
	28	+ */
	29	+@Component
	30	+public class FolicAcidFacade {
	31	+
	32	+ @Autowired
	33	+ private ResidentsArchiveService residentsArchiveService;
	34	+ @Autowired
	35	+ private FolicAcidService folicAcidService;
	36	+ @Autowired
	37	+ private OrganizationService organizationService;
	38	+
	39	+ public BaseResponse addOrUpdateFolicAcid(FolicAcidAddRequest addRequest,Integer userId){
	40	+
	41	+ String id = null;
	42	+ if (StringUtils.isNotEmpty(addRequest.getParentId())){
	43	+ id = addOrUpdate(addRequest,userId,addRequest.getParentId());
	44	+ }
	45	+ BaseObjectResponse br = new BaseObjectResponse();
	46	+ br.setErrorcode(ErrorCodeConstants.SUCCESS);
	47	+ br.setErrormsg("成功");
	48	+ br.setData(id);
	49	+ return br;
	50	+ }
	51	+
	52	+
	53	+ private String addOrUpdate(FolicAcidAddRequest addRequest,Integer userId,String parentId){
	54	+
	55	+ String id = null;
	56	+
	57	+ FolicAcid folicAcid = new FolicAcid();
	58	+ folicAcid.setHospitalId(addRequest.getHospitalId());
	59	+ folicAcid.setParentId(parentId);
	60	+ folicAcid.setDrawCount(addRequest.getDrawCount());
	61	+ folicAcid.setPregnancyType(addRequest.getPregnancyType());
	62	+ folicAcid.setPregnancyWeeks(addRequest.getPregnancyWeeks());
	63	+ folicAcid.setHighRisk(addRequest.getHighRisk());
	64	+ folicAcid.setOperator(addRequest.getOperator());
	65	+ folicAcid.setDrawTime(addRequest.getDrawTime());
	66	+ folicAcid.setYn(YnEnums.YES.getId());
	67	+ folicAcid.setModified(new Date());
	68	+ if (StringUtils.isNotEmpty(addRequest.getId())){
	69	+ folicAcid.setId(addRequest.getId());
	70	+ folicAcidService.updateFolicAcid(folicAcid,addRequest.getId());
	71	+ id = addRequest.getId();
	72	+ }else {
	73	+ folicAcid.setCreated(new Date());
	74	+ folicAcid.setPublishId(userId);
	75	+ id = folicAcidService.addFolicAcid(folicAcid).getId();
	76	+ }
	77	+ return id;
	78	+ }
	79	+
	80	+ public BaseObjectResponse getFolicAcid(FolicAcidQueryRequest queryRequest){
	81	+ Map<String, Object> archiveMap = null;
	82	+ FolicAcid folicAcid = null;
	83	+ ResidentsArchiveModel archiveModel = null;
	84	+ Map<String, Object> resultMap = new HashMap<>();
	85	+
	86	+ //查询妇女信息
	87	+ if (StringUtils.isNotEmpty(queryRequest.getId())){
	88	+ folicAcid = folicAcidService.getFolicAcid(queryRequest.getId());
	89	+ if (folicAcid!=null && folicAcid.getYn()== YnEnums.YES.getId() && folicAcid.getParentId()!=null){
	90	+ archiveModel = residentsArchiveService.getResident(folicAcid.getId());
	91	+ }
	92	+ }else {
	93	+ ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
	94	+ archiveQuery.setYn(1);
	95	+ archiveQuery.setHospitalId(queryRequest.getHospitalId());
	96	+ if (StringUtils.isNotEmpty(queryRequest.getCardNo())){
	97	+ archiveQuery.setCertificateNum(queryRequest.getCardNo());
	98	+ List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
	99	+ if (CollectionUtils.isNotEmpty(modelList)){
	100	+ archiveModel = modelList.get(0);
	101	+ }
	102	+ }else if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())){
	103	+ archiveQuery.setVcCardNo(queryRequest.getVcCardNo());
	104	+ List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
	105	+ if (CollectionUtils.isNotEmpty(modelList)){
	106	+ archiveModel = modelList.get(0);
	107	+ }
	108	+ }
	109	+ }
	110	+
	111	+ //妇女信息
	112	+ if (archiveModel!=null){
	113	+ archiveMap = new HashMap<>();
	114	+ archiveMap.put("certificateNum", archiveModel.getCertificateNum());
	115	+ archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
	116	+ archiveMap.put("username", archiveModel.getUsername());
	117	+ archiveMap.put("birthday",archiveModel.getBirthday());
	118	+ archiveMap.put("age", archiveModel.getAge());
	119	+ archiveMap.put("phone", archiveModel.getPhone());
	120	+ }
	121	+ resultMap.put("folicAcidResult",folicAcid);
	122	+ resultMap.put("archiveResult",archiveMap);
	123	+ BaseObjectResponse response = new BaseObjectResponse();
	124	+ response.setData(resultMap);
	125	+ response.setErrorcode(ErrorCodeConstants.SUCCESS);
	126	+ response.setErrormsg("成功");
	127	+ return response;
	128	+ }
	129	+
	130	+ public BaseListResponse queryFolicAcid(FolicAcidQueryRequest queryRequest){
	131	+
	132	+ List<FolicAcid> list = new ArrayList<>();
	133	+
	134	+ List<Organization> organizationList = new ArrayList<>();
	135	+
	136	+ FolicAcidQuery folicAcidQuery = new FolicAcidQuery();
	137	+ folicAcidQuery.setYn(YnEnums.YES.getId());
	138	+ folicAcidQuery.setPage(queryRequest.getPage());
	139	+ folicAcidQuery.setLimit(queryRequest.getLimit());
	140	+ folicAcidQuery.setNeed("y");
	141	+
	142	+ folicAcidQuery.setHospitalId(queryRequest.getHospitalId());
	143	+ folicAcidQuery.setDrawTimeStart(queryRequest.getDrawTimeStart());
	144	+ folicAcidQuery.setDrawTimeEnd(queryRequest.getDrawTimeEnd());
	145	+ folicAcidQuery.setHighRisk(queryRequest.getHighRisk());
	146	+
	147	+ //省市区筛选机构
	148	+ if (StringUtils.isNotEmpty(queryRequest.getProvinceId()) \|\| StringUtils.isNotEmpty(queryRequest.getCityId()) \|\|
	149	+ StringUtils.isNotEmpty(queryRequest.getAreaId())){
	150	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	151	+ organizationQuery.setYn(YnEnums.YES.getId());
	152	+ organizationQuery.setProvinceId(queryRequest.getProvinceId());
	153	+ organizationQuery.setCityId(queryRequest.getCityId());
	154	+ organizationQuery.setAreaId(queryRequest.getAreaId());
	155	+ organizationList = organizationService.queryHospitals(organizationQuery);
	156	+ }
	157	+ if (CollectionUtils.isNotEmpty(organizationList)){
	158	+ for (Organization hospital : organizationList){
	159	+ folicAcidQuery.setHospitalId(String.valueOf(hospital.getId()));
	160	+ List<FolicAcid> folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery);
	161	+ list.addAll(folicAcidList);
	162	+ }
	163	+ }else {
	164	+ List<FolicAcid> folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery);
	165	+ list.addAll(folicAcidList);
	166	+ }
	167	+ BaseListResponse baseListResponse = new BaseListResponse();
	168	+ baseListResponse.setErrormsg("成功");
	169	+ baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	170	+ baseListResponse.setData(list);
	171	+ baseListResponse.setPageInfo(folicAcidQuery.getPageInfo());
	172	+ return baseListResponse;
	173	+ }
	174	+
	175	+}

...	...	@@ -460,7 +460,15 @@
460	460	}
461	461
462	462
	463	+ public BaseObjectResponse queryCardNoType(){
	464	+ BaseObjectResponse response = new BaseObjectResponse();
463	465
	466	+ List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
	467	+ response.setData(pcerteTypeResult);
	468	+ response.setErrorcode(ErrorCodeConstants.SUCCESS);
	469	+ response.setErrormsg("成功");
	470	+ return response;
	471	+ }
464	472
465	473	}

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+import java.util.Date;
	4	+
	5	+/**
	6	+ * Created by Administrator on 2016/12/5 0005.
	7	+ */
	8	+public class FolicAcidAddRequest {
	9	+
	10	+ private String id;
	11	+
	12	+ private String parentId;
	13	+ /* 领取信息 */
	14	+ //领取数量
	15	+ private String drawCount;
	16	+ //孕期类型
	17	+ private Integer pregnancyType;
	18	+ //孕周
	19	+ private String pregnancyWeeks;
	20	+ //高危因素
	21	+ private String highRisk;
	22	+
	23	+ /* 发放信息 */
	24	+ //发放单位
	25	+ private String hospitalId;
	26	+ //发放人
	27	+ private String operator;
	28	+ //领取时间
	29	+ private Date drawTime;
	30	+
	31	+ public String getId() {
	32	+ return id;
	33	+ }
	34	+
	35	+ public void setId(String id) {
	36	+ this.id = id;
	37	+ }
	38	+
	39	+ public String getParentId() {
	40	+ return parentId;
	41	+ }
	42	+
	43	+ public void setParentId(String parentId) {
	44	+ this.parentId = parentId;
	45	+ }
	46	+
	47	+ public String getDrawCount() {
	48	+ return drawCount;
	49	+ }
	50	+
	51	+ public void setDrawCount(String drawCount) {
	52	+ this.drawCount = drawCount;
	53	+ }
	54	+
	55	+ public Integer getPregnancyType() {
	56	+ return pregnancyType;
	57	+ }
	58	+
	59	+ public void setPregnancyType(Integer pregnancyType) {
	60	+ this.pregnancyType = pregnancyType;
	61	+ }
	62	+
	63	+ public String getPregnancyWeeks() {
	64	+ return pregnancyWeeks;
	65	+ }
	66	+
	67	+ public void setPregnancyWeeks(String pregnancyWeeks) {
	68	+ this.pregnancyWeeks = pregnancyWeeks;
	69	+ }
	70	+
	71	+ public String getHighRisk() {
	72	+ return highRisk;
	73	+ }
	74	+
	75	+ public void setHighRisk(String highRisk) {
	76	+ this.highRisk = highRisk;
	77	+ }
	78	+
	79	+ public String getHospitalId() {
	80	+ return hospitalId;
	81	+ }
	82	+
	83	+ public void setHospitalId(String hospitalId) {
	84	+ this.hospitalId = hospitalId;
	85	+ }
	86	+
	87	+ public String getOperator() {
	88	+ return operator;
	89	+ }
	90	+
	91	+ public void setOperator(String operator) {
	92	+ this.operator = operator;
	93	+ }
	94	+
	95	+ public Date getDrawTime() {
	96	+ return drawTime;
	97	+ }
	98	+
	99	+ public void setDrawTime(Date drawTime) {
	100	+ this.drawTime = drawTime;
	101	+ }
	102	+}

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+import com.lyms.platform.common.core.annotation.form.Form;
	4	+
	5	+import java.util.Date;
	6	+
	7	+/**
	8	+ * Created by Administrator on 2016/12/5 0005.
	9	+ */
	10	+@Form
	11	+public class FolicAcidQueryRequest extends BasePageQueryRequest {
	12	+
	13	+ private String id;
	14	+
	15	+ //证件号
	16	+ private String cardNo;
	17	+ //证件号类型
	18	+ private String certificateTypeId;
	19	+ //就诊卡号
	20	+ private String vcCardNo;
	21	+ //医院ID
	22	+ private String hospitalId;
	23	+ //省
	24	+ private String provinceId;
	25	+ //市
	26	+ private String cityId;
	27	+ //区县
	28	+ private String areaId;
	29	+ //发放开始时间
	30	+ private Date drawTimeStart;
	31	+ //结束时间
	32	+ private Date drawTimeEnd;
	33	+ //高危因素
	34	+ private String highRisk;
	35	+
	36	+ public String getId() {
	37	+ return id;
	38	+ }
	39	+
	40	+ public void setId(String id) {
	41	+ this.id = id;
	42	+ }
	43	+
	44	+ public String getCardNo() {
	45	+ return cardNo;
	46	+ }
	47	+
	48	+ public void setCardNo(String cardNo) {
	49	+ this.cardNo = cardNo;
	50	+ }
	51	+
	52	+ public String getCertificateTypeId() {
	53	+ return certificateTypeId;
	54	+ }
	55	+
	56	+ public void setCertificateTypeId(String certificateTypeId) {
	57	+ this.certificateTypeId = certificateTypeId;
	58	+ }
	59	+
	60	+ public String getVcCardNo() {
	61	+ return vcCardNo;
	62	+ }
	63	+
	64	+ public void setVcCardNo(String vcCardNo) {
	65	+ this.vcCardNo = vcCardNo;
	66	+ }
	67	+
	68	+ public String getHospitalId() {
	69	+ return hospitalId;
	70	+ }
	71	+
	72	+ public void setHospitalId(String hospitalId) {
	73	+ this.hospitalId = hospitalId;
	74	+ }
	75	+
	76	+ public String getProvinceId() {
	77	+ return provinceId;
	78	+ }
	79	+
	80	+ public void setProvinceId(String provinceId) {
	81	+ this.provinceId = provinceId;
	82	+ }
	83	+
	84	+ public String getCityId() {
	85	+ return cityId;
	86	+ }
	87	+
	88	+ public void setCityId(String cityId) {
	89	+ this.cityId = cityId;
	90	+ }
	91	+
	92	+ public String getAreaId() {
	93	+ return areaId;
	94	+ }
	95	+
	96	+ public void setAreaId(String areaId) {
	97	+ this.areaId = areaId;
	98	+ }
	99	+
	100	+ public Date getDrawTimeStart() {
	101	+ return drawTimeStart;
	102	+ }
	103	+
	104	+ public void setDrawTimeStart(Date drawTimeStart) {
	105	+ this.drawTimeStart = drawTimeStart;
	106	+ }
	107	+
	108	+ public Date getDrawTimeEnd() {
	109	+ return drawTimeEnd;
	110	+ }
	111	+
	112	+ public void setDrawTimeEnd(Date drawTimeEnd) {
	113	+ this.drawTimeEnd = drawTimeEnd;
	114	+ }
	115	+
	116	+ public String getHighRisk() {
	117	+ return highRisk;
	118	+ }
	119	+
	120	+ public void setHighRisk(String highRisk) {
	121	+ this.highRisk = highRisk;
	122	+ }
	123	+}