jiangjiazhi / regional-platform

Commit 96fd2df076b8ae3cc25703a4b69d2e14917d67c0

Authored by dongqin over 6 years ago

Exists in master and in 6 other branches

业务逻辑添加 + bug 修复

Showing 6 changed files with 129 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowPushModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/QuestionnaireListRequest.java

...	...	@@ -92,7 +92,43 @@
92	92
93	93	private Date updateTime;
94	94
	95	+ /**
	96	+ * 1/已推送 2/已填写 3/已确认
	97	+ */
	98	+ private String pushStatus;
	99	+
95	100	private Integer yn;
	101	+
	102	+ /**
	103	+ * 产后访视id
	104	+ */
	105	+ private String matdeliverFollowId;
	106	+
	107	+ private String parentId;
	108	+
	109	+ public String getMatdeliverFollowId() {
	110	+ return matdeliverFollowId;
	111	+ }
	112	+
	113	+ public void setMatdeliverFollowId(String matdeliverFollowId) {
	114	+ this.matdeliverFollowId = matdeliverFollowId;
	115	+ }
	116	+
	117	+ public String getParentId() {
	118	+ return parentId;
	119	+ }
	120	+
	121	+ public void setParentId(String parentId) {
	122	+ this.parentId = parentId;
	123	+ }
	124	+
	125	+ public String getPushStatus() {
	126	+ return pushStatus;
	127	+ }
	128	+
	129	+ public void setPushStatus(String pushStatus) {
	130	+ this.pushStatus = pushStatus;
	131	+ }
96	132
97	133	public String getCreateDoctor() {
98	134	return createDoctor;

...	...	@@ -176,6 +176,19 @@
176	176	*/
177	177	private String xzType;
178	178
	179	+ /**
	180	+ * 推送时间针对列表多条件筛选
	181	+ */
	182	+ private Date pushTime;
	183	+
	184	+ public Date getPushTime() {
	185	+ return pushTime;
	186	+ }
	187	+
	188	+ public void setPushTime(Date pushTime) {
	189	+ this.pushTime = pushTime;
	190	+ }
	191	+
179	192	public String getXzType() {
180	193	return xzType;
181	194	}

...	...	@@ -5,6 +5,7 @@
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 com.lyms.platform.common.utils.StringUtils;
8	9	import org.apache.commons.collections.CollectionUtils;
9	10	import org.bson.types.ObjectId;
10	11	import org.springframework.data.mongodb.core.query.Criteria;
...	...	@@ -170,6 +171,26 @@
170	171
171	172	private Integer endAge;
172	173
	174	+ private String startPushTime;
	175	+
	176	+ private String endPushTime;
	177	+
	178	+ public String getStartPushTime() {
	179	+ return startPushTime;
	180	+ }
	181	+
	182	+ public void setStartPushTime(String startPushTime) {
	183	+ this.startPushTime = startPushTime;
	184	+ }
	185	+
	186	+ public String getEndPushTime() {
	187	+ return endPushTime;
	188	+ }
	189	+
	190	+ public void setEndPushTime(String endPushTime) {
	191	+ this.endPushTime = endPushTime;
	192	+ }
	193	+
173	194	public String getFsHospitalId() {
174	195	return fsHospitalId;
175	196	}
...	...	@@ -382,6 +403,10 @@
382	403	c = Criteria.where("rHloseBloodL").gte(1000).lt(2000);
383	404	break;
384	405	}
	406	+ }
	407	+
	408	+ if (StringUtils.isNotEmpty(startPushTime) && StringUtils.isNotEmpty(endPushTime)) {
	409	+ c = Criteria.where("pushTime").gte(startPushTime).lte(endPushTime);
385	410	}
386	411
387	412	if (babyIds != null && babyIds.size() > 0) {

...	...	@@ -203,6 +203,10 @@
203	203
204	204	MatdeliverFollowModel before = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId());
205	205
	206	+ // 若为问卷推送类型则更新推送状态
	207	+ if (PostpartumFollowMakeEnums.TypeEnum.WJTS.getId() == matDeliverFollowAddRequest.getMakeType()) {
	208	+ mongoTemplate.updateFirst(Query.query(Criteria.where("matdeliverFollowId").is(matDeliverFollowAddRequest.getId())), Update.update("pushStatus", "3"), MatdeliverFollowPushModel.class);
	209	+ }
206	210	//修改随访信息
207	211	matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId());
208	212
...	...	@@ -711,7 +715,8 @@
711	715	MatdeliverFollowPushModel pushModel = new MatdeliverFollowPushModel();
712	716	MaternalDeliverModel deliverModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(deliverId)), MaternalDeliverModel.class);
713	717	if (deliverModel != null) {
714		- Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(deliverModel.getParentId())), Patients.class);
	718	+ String parentId = deliverModel.getParentId();
	719	+ Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(parentId)), Patients.class);
715	720	if (patients != null) {
716	721	pushModel.setBirth(patients.getBirth());
717	722	pushModel.setCardNo(patients.getCardNo());
718	723
719	724
...	...	@@ -722,11 +727,19 @@
722	727	pushModel.setCreateDoctor(userId.toString());
723	728	pushModel.setYn(YnEnums.YES.getId());
724	729	pushModel.setHospitalId(hospitalId);
	730	+ pushModel.setSendTime(new Date());
	731	+ pushModel.setPushStatus("1");
	732	+ pushModel.setMatdeliverFollowId(followModelId);
	733	+ pushModel.setParentId(parentId);
725	734	mongoTemplate.insert(pushModel);
	735	+
	736	+ // 将推送时间更新到分娩表中
	737	+ mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(deliverId)), Update.update("pushTime", new Date()), MaternalDeliverModel.class);
726	738	}
727	739	}
728	740
729	741
	742	+
730	743	// 推送到指定用户中
731	744	Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
732	745	Users users = usersService.getUsers(userId);
...	...	@@ -797,6 +810,7 @@
797	810	}
798	811	update.set("visitStatus", 2);
799	812	update.set("visitDate", new Date());
	813	+ update.set("pushStatus", "2");
800	814	Query query = Query.query(Criteria.where("id").is(id));
801	815	mongoTemplate.updateFirst(query, update, MatdeliverFollowModel.class);
802	816	return baseResponse;
803	817
...	...	@@ -863,9 +877,16 @@
863	877	query.addCriteria(Criteria.where("confirmTime").gte(start).lte(end));
864	878	}
865	879
	880	+ // 确认医生
866	881	String confirmDoctor = param.getConfirmDoctor();
867	882	if (StringUtils.isNotEmpty(confirmDoctor)) {
868	883	query.addCriteria(Criteria.where("confirmDoctor").is(confirmDoctor));
	884	+ }
	885	+
	886	+ // 推送状态
	887	+ String pushStatus = param.getPushStatus();
	888	+ if (StringUtils.isNotEmpty(pushStatus)) {
	889	+ query.addCriteria(Criteria.where("pushStatus").is(pushStatus));
869	890	}
870	891
871	892	long count = mongoTemplate.count(query, MatdeliverFollowPushModel.class);

...	...	@@ -126,6 +126,26 @@
126	126	*/
127	127	private String highRiskLevel;
128	128
	129	+ private String startPushTime;
	130	+
	131	+ private String endPushTime;
	132	+
	133	+ public String getStartPushTime() {
	134	+ return startPushTime;
	135	+ }
	136	+
	137	+ public void setStartPushTime(String startPushTime) {
	138	+ this.startPushTime = startPushTime;
	139	+ }
	140	+
	141	+ public String getEndPushTime() {
	142	+ return endPushTime;
	143	+ }
	144	+
	145	+ public void setEndPushTime(String endPushTime) {
	146	+ this.endPushTime = endPushTime;
	147	+ }
	148	+
129	149	public String getStartAge() {
130	150	return startAge;
131	151	}

...	...	@@ -54,6 +54,19 @@
54	54	*/
55	55	private String confirmDoctor;
56	56
	57	+ /**
	58	+ * 推送状态 1已推送 2已填写 3已审核
	59	+ */
	60	+ private String pushStatus;
	61	+
	62	+ public String getPushStatus() {
	63	+ return pushStatus;
	64	+ }
	65	+
	66	+ public void setPushStatus(String pushStatus) {
	67	+ this.pushStatus = pushStatus;
	68	+ }
	69	+
57	70	public String getQueryNo() {
58	71	return queryNo;
59	72	}