jiangjiazhi / regional-platform

Commit bbda5b724bcb91337f3fa1a99501c2c9f72cc805

Authored by liquanyu almost 7 years ago

Exists in master and in 6 other branches

新生儿访视-本辖区待访视新生儿列表自动呈现

Showing 6 changed files with 88 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java

...	...	@@ -67,6 +67,7 @@
67	67	* 母亲的id
68	68	*/
69	69	private String parentId;
	70	+ private List<String> parentIds;
70	71
71	72	/**
72	73	* 生日
...	...	@@ -236,6 +237,14 @@
236	237	//身高
237	238	private String babyHeightStart;
238	239	private String babyHeightEnd;
	240	+
	241	+ public List<String> getParentIds() {
	242	+ return parentIds;
	243	+ }
	244	+
	245	+ public void setParentIds(List<String> parentIds) {
	246	+ this.parentIds = parentIds;
	247	+ }
239	248
240	249	public String getBabyWeightStart() {
241	250	return babyWeightStart;

...	...	@@ -316,6 +316,9 @@
316	316
317	317	private String blNum;
318	318
	319	+
	320	+ private List<String> childExtAddrs;
	321	+
319	322	public MongoQuery convertToQuery() {
320	323	MongoCondition condition = MongoCondition.newInstance();
321	324
...	...	@@ -333,6 +336,10 @@
333	336	condition = condition.and("dueStatus", dueStatus, MongoOper.IS);
334	337	}
335	338
	339	+ if (null != childExtAddrs && childExtAddrs.size() > 0) {
	340	+ condition = condition.and("childExtAddrs", childExtAddrs, MongoOper.IN);
	341	+ }
	342	+
336	343	if (null != noCityRegisterId) {
337	344	condition = condition.and("cityRegisterId", noCityRegisterId, MongoOper.NE);
338	345	}
...	...	@@ -951,6 +958,13 @@
951	958	}
952	959
953	960
	961	+ public List<String> getChildExtAddrs() {
	962	+ return childExtAddrs;
	963	+ }
	964	+
	965	+ public void setChildExtAddrs(List<String> childExtAddrs) {
	966	+ this.childExtAddrs = childExtAddrs;
	967	+ }
954	968
955	969	public List<String> getrFactorList() {
956	970	return rFactorList;

...	...	@@ -444,7 +444,7 @@
444	444	BaseListResponse baseListResponse;
445	445	try {
446	446	newBabyManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
447		- NewBabyManagerResult newBabyManagerResult = matDeliverFacade.newBabyManager(newBabyManagerRequest);
	447	+ NewBabyManagerResult newBabyManagerResult = matDeliverFacade.newBabyManager(newBabyManagerRequest,getUserId(httpServletRequest));
448	448	if (newBabyManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) {
449	449	baseListResponse = new BaseListResponse().setErrorcode(newBabyManagerResult.getErrorcode()).setErrormsg(newBabyManagerResult.getErrormsg());
450	450	return baseListResponse;
...	...	@@ -465,7 +465,7 @@
465	465	newBabyManagerRequest.setExcel(true);
466	466	// 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据
467	467	@SuppressWarnings("unchecked")
468		- List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest).getData();
	468	+ List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = matDeliverFacade.newBabyManager(newBabyManagerRequest,getUserId(httpServletRequest)).getData();
469	469	List<Map<String, Object>> list = new ArrayList<>();
470	470	int num = 1;
471	471	for (NewBabyManagerQueryModel newBabyManagerQueryModel : newBabyManagerQueryModelList) {

...	...	@@ -2135,7 +2135,7 @@
2135	2135	return childbirthManagerResult;
2136	2136	}
2137	2137
2138		- public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest) {
	2138	+ public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest,Integer userId) {
2139	2139	NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult();
2140	2140	BabyModelQuery babyModelQuery = new BabyModelQuery();
2141	2141	//babyModelQuery.setYn(YnEnums.YES.getId());
2142	2142
...	...	@@ -2157,9 +2157,53 @@
2157	2157	babyModelQuery.setLimit(newBabyManagerRequest.getLimit());
2158	2158	babyModelQuery.setNeed("Need");
2159	2159	}
2160		- babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
	2160	+
2161	2161	babyModelQuery.setBuildType(2);
2162	2162	babyModelQuery.setOrder("birth");
	2163	+
	2164	+ if (newBabyManagerRequest.getVisitStatus() != null && newBabyManagerRequest.getVisitStatus() == 1)
	2165	+ {
	2166	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	2167	+ PostVisitHospitalModelQuery postQuery = new PostVisitHospitalModelQuery();
	2168	+ postQuery.setPostHosptial(hospitalId);
	2169	+ List<PostVisitHospitalModel> postVisitHospitalModel = postVisitHospitalService.queryPostVisitHospitalModel(postQuery);
	2170	+ List<String> excData = new ArrayList<>();
	2171	+ if (CollectionUtils.isNotEmpty(postVisitHospitalModel)) {
	2172	+ for (PostVisitHospitalModel phm : postVisitHospitalModel) {
	2173	+ excData.addAll(phm.getAreaTiters());
	2174	+ }
	2175	+ }
	2176	+
	2177	+ //权限所有的医院
	2178	+ List<String> allHospitalList = new ArrayList<>();
	2179	+ DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
	2180	+ dataPermissionsModelQuery.setUserId(userId);
	2181	+ List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
	2182	+ if (CollectionUtils.isNotEmpty(permissionsModels)) {
	2183	+ Set<String> set = permissionsModels.get(0).getData().keySet();
	2184	+ Iterator<String> it = set.iterator();
	2185	+ while (it.hasNext()) {
	2186	+ String id = it.next();
	2187	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id)) {
	2188	+ allHospitalList.add(id);
	2189	+ }
	2190	+ }
	2191	+ }
	2192	+
	2193	+ PatientsQuery patientsQuery = new PatientsQuery();
	2194	+ patientsQuery.setChildExtAddrs(excData);
	2195	+ patientsQuery.setHospitalList(allHospitalList);
	2196	+ List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
	2197	+ List<String> patientIds = new ArrayList<>();
	2198	+ for (Patients patients : patientsList) {
	2199	+ patientIds.add(patients.getId());
	2200	+ }
	2201	+ babyModelQuery.setParentIds(patientIds);
	2202	+ babyModelQuery.setVisitstatus(VisitStatusEnums.VISITED.getId());
	2203	+ babyModelQuery.setHospitalIdList(allHospitalList);
	2204	+ } else {
	2205	+ babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
	2206	+ }
2163	2207
2164	2208	List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
2165	2209	if (CollectionUtils.isEmpty(babyModelList)) {

...	...	@@ -36,6 +36,17 @@
36	36	//畸形key
37	37	private String deformityKey;
38	38
	39	+ //空或者0 全部 1 本辖区待
	40	+ private Integer visitStatus;
	41	+
	42	+ public Integer getVisitStatus() {
	43	+ return visitStatus;
	44	+ }
	45	+
	46	+ public void setVisitStatus(Integer visitStatus) {
	47	+ this.visitStatus = visitStatus;
	48	+ }
	49	+
39	50	public String getDeformityKey() {
40	51	return deformityKey;
41	52	}

1	1	package com.lyms.platform.operate.web.service.impl;
2	2
	3	+import com.lyms.platform.biz.service.BabyService;
3	4	import com.lyms.platform.biz.service.DataPermissionService;
4	5	import com.lyms.platform.common.enums.*;
5	6	import com.lyms.platform.common.result.BaseObjectResponse;
6	7
...	...	@@ -68,8 +69,9 @@
68	69
69	70	@Autowired
70	71	private OrganizationGroupsFacade organizationGroupsFacade;
	72	+ @Autowired
	73	+ private BabyService babyService;
71	74
72		-
73	75	@Autowired
74	76	private OperateLogFacade operateLogFacade;
75	77
...	...	@@ -110,6 +112,9 @@
110	112	newbornVisit.setPid(babyModel.getPid());
111	113	}
112	114	mongoTemplate.save(newbornVisit);
	115	+
	116	+ babyModel.setVisitstatus(VisitStatusEnums.VISITED.getId());
	117	+ babyService.updateOneBaby(babyModel,babyModel.getId());
113	118
114	119	operateLogFacade.addAddOptLog(userId, Integer.valueOf(hospitalId), newbornVisit, OptActionEnums.ADD.getId(), "添加新生儿访视");
115	120