jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 38 additions and 13 deletions

...	...	@@ -60,7 +60,7 @@
60	60	MongoQuery mongoQuery = matDeliverQuery.convertToQuery();
61	61	matDeliverQuery.mysqlBuild(iMatDeliverDao.count(matDeliverQuery.convertToQuery()));
62	62	mongoQuery.start(matDeliverQuery.getOffset()).end(matDeliverQuery.getLimit());
63		- return iMatDeliverDao.pageQuery(mongoQuery.addOrder(Sort.Direction.DESC, "dueDate1"));
	63	+ return iMatDeliverDao.pageQuery(mongoQuery.addOrder(Sort.Direction.DESC, "created"));
64	64	}
65	65	}

...	...	@@ -32,6 +32,11 @@
32	32
33	33	private boolean neEnd;
34	34
	35	+ /**
	36	+ * 是否有效
	37	+ */
	38	+ private Integer yn;
	39	+
35	40	private String deliveryModeQueryJson;
36	41	private String fmHospital;
37	42	private List<String> fmHospitalList;
...	...	@@ -44,6 +49,10 @@
44	49	* 预约失败理由（1-无人接听电话、2-拒绝访视、3-其他）
45	50	*/
46	51	private Integer contactReason;
	52	+ /**
	53	+ * 访视类型 1、上门访视 2、电话访视
	54	+ */
	55	+ private Integer makeType;
47	56
48	57	/**
49	58	* 访视状态（1-待访视、2-已访视）
...	...	@@ -64,6 +73,14 @@
64	73	*/
65	74	private String matFollowId;
66	75
	76	+ public Integer getMakeType() {
	77	+ return makeType;
	78	+ }
	79	+
	80	+ public void setMakeType(Integer makeType) {
	81	+ this.makeType = makeType;
	82	+ }
	83	+
67	84	public Integer getVisitStatus() {
68	85	return visitStatus;
69	86	}
...	...	@@ -176,11 +193,6 @@
176	193	this.endStart = endStart;
177	194	}
178	195
179		- /**
180		- * 是否有效
181		- */
182		- private Integer yn;
183		-
184	196	public String getPid() {
185	197	return pid;
186	198	}
...	...	@@ -226,6 +238,9 @@
226	238	}
227	239	if (null != contactResult) {
228	240	condition = condition.and("contactResult", contactResult, MongoOper.IS);
	241	+ }
	242	+ if (null != makeType) {
	243	+ condition = condition.and("makeType", makeType, MongoOper.IS);
229	244	}
230	245	if (null != contactReason) {
231	246	condition = condition.and("contactReason", contactReason, MongoOper.IS);

...	...	@@ -1236,7 +1236,7 @@
1236	1236	matDeliverQuery.setVisitResult(matdeliverFollowRequest.getVisitResult());
1237	1237	matDeliverQuery.setVisitAffirm(matdeliverFollowRequest.getVisitAffirm());
1238	1238	matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus());
1239		-
	1239	+ matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType());
1240	1240	List<MaternalDeliverModel> maternalDeliverModelList;
1241	1241
1242	1242	if(StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())){//是否分页
...	...	@@ -1247,8 +1247,6 @@
1247	1247	}else{
1248	1248	maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1249	1249	}
1250		-
1251		-
1252	1250
1253	1251	if (CollectionUtils.isEmpty(maternalDeliverModelList)) {
1254	1252	// 没有查到，直接抛出

...	...	@@ -351,7 +351,7 @@
351	351	cnames.put("address", "居住地");
352	352	cnames.put("phone", "联系电话");
353	353	cnames.put("contactResultStr", "联系状态");
354		- cnames.put("visitAffirm", "产妇确认");
	354	+ // cnames.put("visitAffirm", "产妇确认");
355	355	cnames.put("makeType", "访视类型");
356	356	cnames.put("visitResult", "访视结果");
357	357	cnames.put("nextVisitDate", "下次随访");
358	358
359	359
...	...	@@ -367,17 +367,17 @@
367	367	result.put("hospitalCityName", mf.getHospitalCityName());
368	368	result.put("hospitalAreaName", mf.getHospitalAreaName());
369	369	result.put("name", mf.getName());
370		- result.put("age", String.valueOf(mf.getAge()));
	370	+ result.put("age", mf.getAge()==null?"--":String.valueOf(mf.getAge()));
371	371	result.put("fmHospital", mf.getFmHospital());
372	372	result.put("postViewDay", mf.getPostViewDay());
373	373	result.put("address", mf.getAddress());
374	374	result.put("phone", mf.getPhone());
375		- if(StringUtils.isNotEmpty(mf.getContactResultStr())){
	375	+ if(StringUtils.isEmpty(mf.getContactResultStr())){
376	376	result.put("contactResultStr", "待联系");
377	377	}else{
378	378	result.put("contactResultStr", mf.getContactResultStr());
379	379	}
380		- result.put("visitAffirm", mf.getVisitAffirm());
	380	+ // result.put("visitAffirm", mf.getVisitAffirm());
381	381	result.put("makeType", mf.getMakeType());
382	382	result.put("visitResult",mf.getVisitResult());
383	383	result.put("nextVisitDate", mf.getNextVisitDate());

...	...	@@ -63,6 +63,10 @@
63	63	*/
64	64	private Integer visitStatus;
65	65	/**
	66	+ * 预约访视类型（1-上门访视、2-电话访视）
	67	+ */
	68	+ private Integer makeType;
	69	+ /**
66	70	* 访视结果（1-成功、2-失败）
67	71	*/
68	72	private Integer visitResult;
...	...	@@ -74,6 +78,14 @@
74	78	* 是否分页（导出不分页，普通分页）
75	79	*/
76	80	private String need;
	81	+
	82	+ public Integer getMakeType() {
	83	+ return makeType;
	84	+ }
	85	+
	86	+ public void setMakeType(Integer makeType) {
	87	+ this.makeType = makeType;
	88	+ }
77	89
78	90	public String getNeed() {
79	91	return need;