liquanyu / regional-platform

Commit ff76345c15e8b9bea52bb1a58e13c090a27a2154

Authored by yangfei over 8 years ago

追访流程调整

Showing 4 changed files with 32 additions and 13 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java

...	...	@@ -6,11 +6,16 @@
6	6	public enum TrackDownDateEnums {
7	7	A(1, "婚前检查",2),
8	8	B(2, "怀孕建档",3),
9		- C(3, "产前检查",5),
10		- D(4, "产前筛查",5),
	9	+ C(3, "产前检查",8),
	10	+ D(4, "产前筛查",9),
11	11	E(5, "分娩住院",6),
12		- F(6, "产后访视",7),
13		- G(7, "产后复查",-1);
	12	+ F(6, "产后访视",10),
	13	+ G(7, "产后复查",11),
	14	+ H(8, "产前检查转出",5),
	15	+ I(9, "产前筛查转出",5),
	16	+ J(10, "产后访视转出",-1),
	17	+ K(11, "产后复查转出",-1),
	18	+ ;
14	19
15	20	TrackDownDateEnums(Integer id, String name,Integer nextid) {
16	21	this.id = id;

...	...	@@ -6,9 +6,6 @@
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
8	8	import com.lyms.platform.common.utils.StringUtils;
9		-import org.apache.commons.collections.CollectionUtils;
10		-import org.slf4j.Logger;
11		-import org.slf4j.LoggerFactory;
12	9	import org.springframework.data.mongodb.core.query.Criteria;
13	10
14	11	import java.util.Date;
...	...	@@ -35,6 +32,7 @@
35	32	private String streetId;
36	33	private String key;
37	34	private Integer trackType;
	35	+ private List trackTypes;
38	36	private String parentId;
39	37	private List<String> pids;
40	38	private String hospitalId;
...	...	@@ -49,6 +47,14 @@
49	47	*/
50	48	private Date lastMensesEnd;
51	49
	50	+ public List getTrackTypes() {
	51	+ return trackTypes;
	52	+ }
	53	+
	54	+ public void setTrackTypes(List trackTypes) {
	55	+ this.trackTypes = trackTypes;
	56	+ }
	57	+
52	58	public Date getLastMensesStart() {
53	59	return lastMensesStart;
54	60	}
55	61
...	...	@@ -168,12 +174,16 @@
168	174	if(null!=trackType){
169	175	condition = condition.and("trackType", trackType, MongoOper.IS);
170	176	}
	177	+ if (null != trackTypes) {
	178	+ condition = condition.and("trackType", trackTypes, MongoOper.IN);
	179	+ }
171	180	if(StringUtils.isNotEmpty(parentId)){
172	181	condition = condition.and("parentId", parentId, MongoOper.IS);
173	182	}
174	183	if (null != pids) {
175	184	condition = condition.and("pid", pids, MongoOper.IN);
176	185	}
	186	+
177	187	Criteria c1 = null;
178	188	if (null != lastMensesStart) {
179	189	if (null != c1) {

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.lyms.platform.biz.service.*;
4		-import com.lyms.platform.common.constants.ErrorCodeConstants;
5	4	import com.lyms.platform.common.enums.FmTypeEnums;
6	5	import com.lyms.platform.common.enums.TrackDownDateEnums;
7		-import com.lyms.platform.common.enums.TrackDownTransferEnums;
8	6	import com.lyms.platform.common.enums.YnEnums;
9		-import com.lyms.platform.common.result.BaseListResponse;
10	7	import com.lyms.platform.common.result.BaseObjectResponse;
11	8	import com.lyms.platform.common.result.PageResult;
12	9	import com.lyms.platform.common.result.RespBuilder;
...	...	@@ -116,8 +113,15 @@
116	113	//如果是产筛请求
117	114	if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
118	115	downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
119		- downRecordQuery.setTrackType(3);
120		- }/*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){
	116	+ downRecordQuery.setTrackTypes(Arrays.asList(4,8));
	117	+ }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()){
	118	+ downRecordQuery.setTrackTypes(Arrays.asList(3,9));
	119	+ }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()){
	120	+ downRecordQuery.setTrackTypes(Arrays.asList(6,11));
	121	+ }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()){
	122	+ downRecordQuery.setTrackTypes(Arrays.asList(7,10));
	123	+ }
	124	+ /*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){
121	125	downRecordQuery.setLastMensesStart();
122	126	}*/
123	127	downRecordQuery.setPage(downQueryRequest.getPage());

...	...	@@ -187,7 +187,7 @@
187	187	trackDown.setPid(mongoUtil.getPid(parentId));
188	188	trackDown.setParentId(parentId);
189	189	}
190		- //怀孕建档扭转直孕期检查的时候需要有孕妇的档案才可以扭转
	190	+ //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转
191	191	if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() &&
192	192	TrackDownDateEnums.B.getId() == trackDown.getTrackDownDateType()
193	193	&&StringUtils.isNotEmpty(trackDown.getParentId())) {