jiangjiazhi / regional-platform

Authored by rui.zhang about 9 years ago

Exists in master and in 8 other branches

Showing 8 changed files

...	...	@@ -37,9 +37,6 @@
37	37
38	38	<finalName>platform-biz-patient-service</finalName>
39	39	</build>
40		- <profiles>
41		- <profile>
42		- </profile>
43		- </profiles>
	40	+
44	41	</project>

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import java.util.List;
4	4
	5	+import org.apache.commons.collections.CollectionUtils;
5	6	import org.apache.commons.lang.StringUtils;
6	7	import org.springframework.beans.factory.annotation.Autowired;
7	8	import org.springframework.data.domain.Sort.Direction;
...	...	@@ -45,8 +46,11 @@
45	46	* @return
46	47	*/
47	48	public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery) {
48		-
49		- return iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery()).get(0);
	49	+ List<PuerperaModel> result = iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery());
	50	+ if(CollectionUtils.isEmpty(result)){
	51	+ return result.get(0);
	52	+ }
	53	+ return null;
50	54	}
51	55
52	56	public PuerperaModel findOnePuerperaById(String id) {

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import java.util.Date;
4	4
	5	+import org.bson.types.ObjectId;
5	6	import org.springframework.data.mongodb.core.query.Criteria;
6	7
7	8	import com.lyms.platform.common.base.IConvertToNativeQuery;
...	...	@@ -154,7 +155,7 @@
154	155	condition= condition.and("communityId", communityId, MongoOper.IS);
155	156	}
156	157	if(null!=id){
157		- condition= condition.and("id", id, MongoOper.IS);
	158	+ condition= condition.and("id", new ObjectId(id), MongoOper.IS);
158	159	}
159	160	if(null!=cardNo){
160	161	condition=condition.and("cardno", cardNo, MongoOper.IS);

...	...	@@ -2,9 +2,9 @@
2	2	#mongo.db.port=27017
3	3	#mongo.db.dbname=platform
4	4
5		-mongo.db.host=localhost
6		-mongo.db.port=27017
7		-mongo.db.dbname=platform
	5	+mongo.db.host=${mongo.db.host}
	6	+mongo.db.port=${mongo.db.port}
	7	+mongo.db.dbname=${mongo.db.dbname}
8	8	mongo.db.username=root
9	9	mongo.db.password=root
10	10
11	11
...	...	@@ -27,15 +27,15 @@
27	27
28	28
29	29	maindata.driver=com.mysql.jdbc.Driver
30		-maindata.jdbcurl=jdbc:mysql://192.168.5.250:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
31		-maindata.username=platform
32		-maindata.password=platform123
	30	+maindata.jdbcurl=${mysql.jdbcurl}
	31	+maindata.username=${mysql.db.name}
	32	+maindata.password=${mysql.db.password}
33	33
34	34	maindata.maxpoolsize=5
35	35	maindata.initialpoolsize=2
36	36	maindata.minpoolsize=2
37	37
38		-redis.servers=192.168.5.250:6379:mommybaby123
	38	+redis.servers=${redis.servers}
39	39
40	40	token.prefix=member
41	41

...	...	@@ -69,7 +69,11 @@
69	69	* @return
70	70	*/
71	71	public BaseObjectResponse findOneByCardNo(String cardNo) {
72		- return doBiz(findOnePuerperaByCardNo(cardNo));
	72	+ PuerperaModel puerperaModel= findOnePuerperaByCardNo(cardNo);
	73	+ if (null == puerperaModel) {
	74	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在");
	75	+ }
	76	+ return doBiz(puerperaModel);
73	77	}
74	78
75	79	/**

...	...	@@ -35,8 +35,6 @@
35	35	*/
36	36	public class TokenValidateInteceptor extends HandlerInterceptorAdapter {
37	37	@Autowired
38		- private TokenService tokenService;
39		- @Autowired
40	38	private UsersService usersService;
41	39
42	40	public static boolean isSiteController(Object handler) {

...	...	@@ -100,7 +100,7 @@
100	100	/**
101	101	* 类型
102	102	*/
103		- private String type;
	103	+ private Map type;
104	104
105	105	/**
106	106	* 伤口
107	107
...	...	@@ -247,11 +247,11 @@
247	247	this.referral = referral;
248	248	}
249	249
250		- public String getType() {
	250	+ public Map getType() {
251	251	return type;
252	252	}
253	253
254		- public void setType(String type) {
	254	+ public void setType(Map type) {
255	255	this.type = type;
256	256	}
257	257
...	...	@@ -272,6 +272,7 @@
272	272	setBp(JsonUtil.str2Obj(model.getBp(), Map.class));
273	273	setGuide(JsonUtil.str2Obj(model.getGuide(), Map.class));
274	274	setReferral(JsonUtil.str2Obj(model.getReferral(), Map.class));
	275	+ setType(JsonUtil.str2Obj(model.getType(), Map.class));
275	276	} catch (Exception e) {
276	277	}
277	278
...	...	@@ -289,7 +290,6 @@
289	290	setMentality(model.getMentality());
290	291	setNextvisit(model.getNextvisit());
291	292	setOther(model.getOther());
292		- setType(model.getType());
293	293	setWound(model.getWound());
294	294	return this;
295	295	}