jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 33 additions and 18 deletions

...	...	@@ -116,16 +116,16 @@
116	116	expiryMap.put(e.getKey(), System.currentTimeMillis() + EXPIRY);
117	117	super.putAll(m);
118	118	}
119		- public Set<Entry<K,V>> entrySet() {
120		- Set<java.util.Map.Entry<K, V>> set = super.entrySet();
121		- Iterator<Entry<K, V>> iterator = set.iterator();
122		- while (iterator.hasNext()) {
123		- java.util.Map.Entry<K, V> entry = iterator.next();
124		- if(checkExpiry(entry.getKey(), false)) iterator.remove();
125		- }
126		-
127		- return set;
128		- }
	119	+// public Set<Entry<K,V>> entrySet() {
	120	+// Set<java.util.Map.Entry<K, V>> set = super.entrySet();
	121	+// Iterator<Entry<K, V>> iterator = set.iterator();
	122	+// while (iterator.hasNext()) {
	123	+// java.util.Map.Entry<K, V> entry = iterator.next();
	124	+// if(checkExpiry(entry.getKey(), false)) iterator.remove();
	125	+// }
	126	+//
	127	+// return set;
	128	+// }
129	129	/**
130	130	*
131	131	* @Description: 是否过期

...	...	@@ -5,6 +5,7 @@
5	5	import com.lyms.platform.common.base.BaseController;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
7	7	import com.lyms.platform.common.result.BaseResponse;
	8	+import com.lyms.platform.common.utils.StringUtils;
8	9	import com.lyms.platform.operate.web.request.AfterVisitPelvicFloorRequest;
9	10	import com.lyms.platform.operate.web.request.AfterVisitPelvicFloorUpdateRequest;
10	11	import com.lyms.platform.operate.web.request.PelvicFloorInfoListRequest;
...	...	@@ -45,7 +46,7 @@
45	46	private BaseResponse query(@RequestBody JSONObject jsonObject, HttpServletRequest request) {
46	47	String queryNo = jsonObject.getString("queryNo");
47	48	String patientIdCard = jsonObject.getString("patientIdCard");
48		- if (Objects.isNull(queryNo) && Objects.isNull(patientIdCard)) {
	49	+ if (StringUtils.isNotEmpty(queryNo) && StringUtils.isNotEmpty(patientIdCard)) {
49	50	return new BaseResponse("参数缺失", ErrorCodeConstants.PARAMETER_ERROR);
50	51	}
51	52	return pelvicFloorService.query(jsonObject, getUserId(request));

...	...	@@ -17,7 +17,6 @@
17	17	import com.lyms.platform.permission.service.OrganizationService;
18	18	import com.lyms.platform.pojo.*;
19	19	import com.lyms.platform.query.*;
20		-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
21	20	import org.apache.commons.collections.CollectionUtils;
22	21	import org.springframework.beans.factory.annotation.Autowired;
23	22	import org.springframework.beans.factory.annotation.Qualifier;

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.lyms.hospitalapi.dzfy.DzfyHisService;
4		-import com.lyms.platform.biz.dal.IFolicAcidDao;
5	4	import com.lyms.platform.biz.service.*;
6	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
7		-import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
8	6	import com.lyms.platform.common.enums.YnEnums;
9	7	import com.lyms.platform.common.result.BaseListResponse;
10	8	import com.lyms.platform.common.result.BaseObjectResponse;
...	...	@@ -13,7 +11,6 @@
13	11	import com.lyms.platform.operate.web.request.AntExAddRequest;
14	12	import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
15	13	import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
16		-import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
17	14	import com.lyms.platform.operate.web.result.AntExManagerResult;
18	15	import com.lyms.platform.operate.web.result.CjStatisticsListResult;
19	16	import com.lyms.platform.operate.web.result.CjStatisticsResult;
...	...	@@ -27,7 +24,6 @@
27	24	import com.lyms.platform.permission.service.impl.MeasureDataInfoServiceImpl;
28	25	import com.lyms.platform.pojo.*;
29	26	import com.lyms.platform.query.*;
30		-import jdk.nashorn.internal.ir.LiteralNode;
31	27	import net.sourceforge.pinyin4j.PinyinHelper;
32	28	import org.apache.commons.collections.CollectionUtils;
33	29	import org.apache.commons.lang.math.NumberUtils;

...	...	@@ -94,9 +94,28 @@
94	94	boolean notEmpty = CollectionUtils.isNotEmpty(babyEyeChecks);
95	95	if (notEmpty) {
96	96	BabyEyeCheck babyEyeCheck = babyEyeChecks.get(0);
97		- if (Objects.nonNull(babyEyeCheck)) {
	97	+ if (babyEyeCheck != null) {
98	98	List<String> projectStrs = InitDataUtils.getPositiveProjectByKey(babyEyeCheck);
99		- babyAfterVisitInfoModel.setPositiveProject(String.join(",", projectStrs));
	99	+
	100	+ StringBuffer sb = new StringBuffer();
	101	+ if (CollectionUtils.isNotEmpty(projectStrs))
	102	+ {
	103	+ for (int i = 0;i < projectStrs.size() ; i++)
	104	+ {
	105	+ if (i == projectStrs.size() -1)
	106	+ {
	107	+ sb.append(projectStrs.get(i));
	108	+ }
	109	+ else
	110	+ {
	111	+ sb.append(projectStrs.get(i));
	112	+ sb.append(",");
	113	+ }
	114	+ }
	115	+ }
	116	+
	117	+
	118	+ babyAfterVisitInfoModel.setPositiveProject(sb.toString());
100	119	babyAfterVisitInfoModel.setCreateTime(new Date());
101	120	babyAfterVisitInfoModel.setCheckDoctor(babyEyeCheck.getOperaterId());
102	121	//BeanUtils.copyProperties(babyEyeCheck, babyAfterVisitInfoModel);