shiyang / regional-platform

Commit a70d7e62db9f09f14eb743b465e39096fad8b804

Authored by landong2015 over 8 years ago

update

Showing 3 changed files with 25 additions and 19 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java

...	...	@@ -20,7 +20,7 @@
20	20	//女性/男性ID
21	21	private String parentId;
22	22	//婚检时间
23		- private String premaritalUpTime;
	23	+ private Date premaritalUpTime;
24	24	//医院ID
25	25	private String hospitalId;
26	26	//创建时间
27	27
...	...	@@ -407,11 +407,11 @@
407	407	this.parentId = parentId;
408	408	}
409	409
410		- public String getPremaritalUpTime() {
	410	+ public Date getPremaritalUpTime() {
411	411	return premaritalUpTime;
412	412	}
413	413
414		- public void setPremaritalUpTime(String premaritalUpTime) {
	414	+ public void setPremaritalUpTime(Date premaritalUpTime) {
415	415	this.premaritalUpTime = premaritalUpTime;
416	416	}
417	417

...	...	@@ -5,10 +5,13 @@
5	5	import com.lyms.platform.common.dao.operator.MongoCondition;
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
	8	+import org.apache.commons.collections.CollectionUtils;
8	9	import org.apache.commons.lang.StringUtils;
9	10	import org.springframework.data.mongodb.core.query.Criteria;
10	11
	12	+import java.util.ArrayList;
11	13	import java.util.Date;
	14	+import java.util.List;
12	15
13	16	/**
14	17	* Created by Administrator on 2016/11/23 0023.
...	...	@@ -47,6 +50,8 @@
47	50	private Integer yiXueYiJian;
48	51	//性别类型
49	52	private Integer sexType;
	53	+ //建档ID
	54	+ List<String> parentIds;
50	55
51	56
52	57	@Override
...	...	@@ -61,6 +66,9 @@
61	66	if (StringUtils.isNotBlank(hospitalId)) {
62	67	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
63	68	}
	69	+ if(CollectionUtils.isNotEmpty(parentIds)){
	70	+ condition = condition.and("parentId", parentIds, MongoOper.IN);
	71	+ }
64	72	if (created!=null) {
65	73	condition = condition.and("created", created, MongoOper.IS);
66	74	}
...	...	@@ -109,6 +117,14 @@
109	117	condition = condition.andCondition(new MongoCondition(c1));
110	118	}
111	119	return condition.toMongoQuery();
	120	+ }
	121	+
	122	+ public List<String> getParentIds() {
	123	+ return parentIds;
	124	+ }
	125	+
	126	+ public void setParentIds(List<String> parentIds) {
	127	+ this.parentIds = parentIds;
112	128	}
113	129
114	130	public Integer getSexType() {

...	...	@@ -112,7 +112,7 @@
112	112	for (PremaritalCheckup data : checkupList){
113	113	PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
114	114	historyResult.setId(data.getId());
115		- historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
	115	+ historyResult.setPremaritalUpTime(DateUtil.getyyyy_MM_dd(data.getPremaritalUpTime()));
116	116	Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
117	117	if (org!=null){
118	118	historyResult.setPremaritalUpHospital(org.getName());
119	119
120	120
...	...	@@ -166,15 +166,14 @@
166	166	*/
167	167	public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request){
168	168
169		- List<PremaritalCheckup> data = new ArrayList<>();
170		-
171	169	List<String> parentIds = new ArrayList<>();
172	170
173	171	//用姓名和联系方式查询到的居民建档ID
174		- if (StringUtils.isNotEmpty(request.getUsername()) \|\| StringUtils.isNotEmpty(request.getPhone())){
	172	+ if (StringUtils.isNotEmpty(request.getUsername()) \|\| StringUtils.isNotEmpty(request.getPhone()) \|\| StringUtils.isNotEmpty(request.getCardNo())){
175	173	ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
176	174	archiveQuery.setYn(YnEnums.YES.getId());
177	175	archiveQuery.setUsername(request.getUsername());
	176	+ archiveQuery.setCertificateNum(request.getCardNo());
178	177	archiveQuery.setPhone(request.getPhone());
179	178	archiveQuery.setHospitalId(request.getHospitalId());
180	179	List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
181	180
...	...	@@ -184,13 +183,11 @@
184	183	}
185	184	}
186	185	}
187		-
188	186	PremaritalCheckupQuery query = new PremaritalCheckupQuery();
189	187	query.setPage(request.getPage());
190	188	query.setLimit(request.getLimit());
191	189	query.setNeed("y");
192	190	query.setYn(YnEnums.YES.getId());
193		- query.setCertificateNum(request.getCardNo());
194	191	query.setYiXueYiJian(request.getYiXueYiJian());
195	192
196	193	if(StringUtils.isNotEmpty(request.getPremaritalUpTime())){
197	194
...	...	@@ -208,17 +205,10 @@
208	205	query.setSexType(request.getSexType());
209	206
210	207	if (CollectionUtils.isNotEmpty(parentIds)){
211		- for (String parentId : parentIds){
212		- query.setParentId(parentId);
213		- List<PremaritalCheckup> premaritalCheckupList = premaritalCheckupService.queryPremaritalCheckup(query);
214		- if (CollectionUtils.isNotEmpty(premaritalCheckupList)){
215		- data.addAll(premaritalCheckupList);
216		- }
217		- }
218		- }else {
219		- data = premaritalCheckupService.queryPremaritalCheckup(query);
	208	+ query.setParentIds(parentIds);
220	209	}
221	210
	211	+ List<PremaritalCheckup> data = premaritalCheckupService.queryPremaritalCheckup(query);
222	212	List<Map> list = new ArrayList<>();
223	213	if (CollectionUtils.isNotEmpty(data)){
224	214	for (PremaritalCheckup checkup : data){
...	...	@@ -491,7 +481,7 @@
491	481	checkup.setModified(new Date());
492	482	checkup.setVcCardNo(addRequest.getVcCardNo());
493	483	checkup.setCertificateNum(addRequest.getCertificateNum());
494		- checkup.setPremaritalUpTime(addRequest.getPremaritalUpTime());
	484	+ checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
495	485	if (StringUtils.isNotEmpty(addRequest.getId())){
496	486	//修改
497	487	checkup.setId(addRequest.getId());