jiangjiazhi / regional-platform

Authored by jiangjiazhi about 8 years ago

Exists in master and in 6 other branches

Showing 4 changed files

...	...	@@ -47,9 +47,11 @@
47	47	}
48	48
49	49	public List<MatdeliverFollowModel> queryByPidsGoup(List pids) {
50		- AggregationOperation match = Aggregation.match(Criteria.where("patientId").in(pids));
51		- AggregationOperation group = Aggregation.group("patientId").max("updateDate").as("updateDate");
52		- Aggregation aggregation = Aggregation.newAggregation(match, group);
	50	+ AggregationOperation match = Aggregation.match(Criteria.where("parentid").in(pids));
	51	+ AggregationOperation group = Aggregation.group("parentid", "hospitalId","deliveryDate","deliverId","contactResult","makeType","makeRemark","makeCreateUser","contactReason","visitResult","visitReason").max("updateDate").as("updateDate");
	52	+ AggregationOperation fields = Aggregation.project("_id", "parentid", "hospitalId","deliveryDate","deliverId","contactResult","makeType","makeRemark","makeCreateUser","contactReason","visitResult","visitReason");
	53	+
	54	+ Aggregation aggregation = Aggregation.newAggregation(match, group,fields);
53	55	AggregationResults<MatdeliverFollowModel> result = this.mongoTemplate.aggregate(aggregation, "lyms_matdeliver_follow", MatdeliverFollowModel.class);
54	56	return result.getMappedResults();
55	57	}

...	...	@@ -15,6 +15,7 @@
15	15	import com.lyms.platform.query.SyncDataQuery;
16	16	import org.apache.commons.codec.binary.Base64;
17	17	import org.apache.commons.lang.StringUtils;
	18	+import org.apache.log4j.Logger;
18	19	import org.springframework.beans.factory.annotation.Autowired;
19	20	import org.springframework.stereotype.Controller;
20	21	import org.springframework.util.ReflectionUtils;
...	...	@@ -35,6 +36,8 @@
35	36	@Controller
36	37	public class SyncDataController extends BaseController {
37	38
	39	+ private Logger log = Logger.getLogger(this.getClass());
	40	+
38	41	@Autowired
39	42	private SyncDataService syncDataService;
40	43
...	...	@@ -63,6 +66,7 @@
63	66	SysBaseFacade sysBaseFacade = (SysBaseFacade) webApplicationContext.getBean(action);
64	67	return sysBaseFacade.execute(synForm);
65	68	} catch (Exception e) {
	69	+ log.error("sysnDataSer异常",e);
66	70	BaseResponse baseResponse = new BaseResponse();
67	71	baseResponse.setObject(e.getMessage());
68	72	baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
...	...	@@ -106,6 +110,7 @@
106	110	}
107	111	return baseResponse;
108	112	} catch (Exception e) {
	113	+ log.error("sysnReflectDataSer异常",e);
109	114	e.printStackTrace();
110	115	baseResponse.setObject(e.getMessage());
111	116	baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);

...	...	@@ -62,6 +62,10 @@
62	62	List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
63	63	if (CollectionUtils.isNotEmpty(patientServices)) {//修改
64	64	PatientService ps = patientServices.get(0);
	65	+ //开通医生修改为小程序开通
	66	+ ps.setCreateUser(null);
	67	+ //操作员修改为小程序开通
	68	+ ps.setUpdateUser(null);
65	69	ps.setSerStatus(patientService.getSerStatus());
66	70	ps.setSerCode(patientService.getSerCode());
67	71	ps.setOrderId(patientService.getOrderId());

...	...	@@ -2051,13 +2051,13 @@
2051	2051	}
2052	2052	}
2053	2053	Integer count = userIds.size();
2054		- List<String> ids = CollectionUtils.getPageIds(userIds, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2"));
2055	2054	Map<String, Object> param2 = new HashMap<>();
2056	2055	param2.putAll(param);
2057	2056	param2.put("hid", param.get("hospitalId"));
2058		- param2.put("uids", ids);
	2057	+// param2.put("uids", ids);
	2058	+ param2.put("uids", userIds);
2059	2059	List<Map<String,Object>> userSendInfo = couponMapper.findUserSendInfoByUids(param2);
2060		- System.out.println(ids);
	2060	+ System.out.println(userIds);
2061	2061	// Integer count = couponMapper.findUserSendInfoCount(param);
2062	2062	for (Map<String, Object> map : userSendInfo) {
2063	2063	String userId = (String) map.get("user_id");
...	...	@@ -2073,7 +2073,7 @@
2073	2073
2074	2074	}
2075	2075	}
2076		- PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", userSendInfo));
	2076	+ PageResult pageResult = new PageResult(count, currentPage,(Integer) param.get("pageSize"), CollectionUtils.createMap("userSendInfos", CollectionUtils.getPageIds(userSendInfo, (Integer) param.get("currentPage2"), (Integer) param.get("pageSize2"))));
2077	2077	return RespBuilder.buildSuccess(pageResult);
2078	2078	} else if(type == 999) { /** 先占位置 */
2079	2079