jiangjiazhi / regional-platform

Commit f5623e1aa4820b68823d174712239c81ba22b30d

Authored by shiyang almost 3 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 49 additions and 61 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyBookbuildingService.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyBuildClassifyModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyBuildClassifyQuery.java

...	...	@@ -253,6 +253,8 @@
253	253	ClassifyModel.setmName(babyModel.getMname());
254	254	ClassifyModel.setmCardNo(babyModel.getMcertNo());
255	255	ClassifyModel.setmPhone(babyModel.getMphone());
	256	+ ClassifyModel.setVcCardNo(babyModel.getVcCardNo());
	257	+ ClassifyModel.setsINCard(babyModel.getsINCard());
256	258	babyBuildClassifyService.add(ClassifyModel);
257	259	} catch (Exception e) {
258	260	throw new RuntimeException(e);

...	...	@@ -62,6 +62,14 @@
62	62	*母亲手机号码
63	63	*/
64	64	private String mPhone;
	65	+ /**
	66	+ *建档社保卡
	67	+ */
	68	+ private String sINCard;
	69	+ /**
	70	+ *建档就诊卡
	71	+ */
	72	+ private String vcCardNo;
65	73
66	74	public String getId() {
67	75	return id;
...	...	@@ -181,6 +189,22 @@
181	189
182	190	public void setHospitalId(String hospitalId) {
183	191	this.hospitalId = hospitalId;
	192	+ }
	193	+
	194	+ public String getsINCard() {
	195	+ return sINCard;
	196	+ }
	197	+
	198	+ public void setsINCard(String sINCard) {
	199	+ this.sINCard = sINCard;
	200	+ }
	201	+
	202	+ public String getVcCardNo() {
	203	+ return vcCardNo;
	204	+ }
	205	+
	206	+ public void setVcCardNo(String vcCardNo) {
	207	+ this.vcCardNo = vcCardNo;
184	208	}
185	209	}

...	...	@@ -59,10 +59,6 @@
59	59	*/
60	60	private Integer isCheck;
61	61	/**
62		- * 姓名
63		- */
64		- private String name;
65		- /**
66	62	* 性别
67	63	*/
68	64	private Integer sex;
69	65
...	...	@@ -75,17 +71,10 @@
75	71	*/
76	72	private Date birthEnd;
77	73	/**
78		- *母亲姓名
	74	+ * 查询号（儿童姓名、母亲姓名、母亲身份证号、手机号、社保卡、就诊卡）
79	75	*/
80		- private String mName;
81		- /**
82		- *母亲证件号
83		- */
84		- private String mCardNo;
85		- /**
86		- *母亲手机号码
87		- */
88		- private String mPhone;
	76	+ private String queryNo;
	77	+
89	78	@Override
90	79	public MongoQuery convertToQuery() {
91	80	MongoCondition condition = MongoCondition.newInstance();
92	81
...	...	@@ -105,25 +94,21 @@
105	94	if (null != isCheck) {
106	95	condition = condition.and("isCheck", isCheck, MongoOper.IS);
107	96	}
108		- if (StringUtils.isNotEmpty( name)) {
109		- condition = condition.and("name", name, MongoOper.IS);
110		- }
111		- if (null != sex) {
112		- condition = condition.and("sex", sex, MongoOper.IS);
113		- }
114		- if (StringUtils.isNotEmpty( mName)) {
115		- condition = condition.and("mName", mName, MongoOper.IS);
116		- }
117		- if (StringUtils.isNotEmpty( mCardNo)) {
118		- condition = condition.and("mCardNo", mCardNo, MongoOper.IS);
119		- }
120		- if (StringUtils.isNotEmpty( mPhone)) {
121		- condition = condition.and("mPhone", mPhone, MongoOper.IS);
122		- }
123	97	if (null!=monthAge) {
124	98	condition = condition.and("monthAge", monthAge, MongoOper.IS);
125	99	}
126	100
	101	+ if (StringUtils.isNotEmpty(queryNo)) {
	102	+ MongoCondition con1 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
	103	+ MongoCondition con2 = MongoCondition.newInstance("mname", queryNo, MongoOper.LIKE);
	104	+ MongoCondition con3 = MongoCondition.newInstance("mCardNo", queryNo, MongoOper.LIKE);
	105	+ MongoCondition con4 = MongoCondition.newInstance("mCardNo", queryNo, MongoOper.LIKE);
	106	+ MongoCondition con5 = MongoCondition.newInstance("mPhone", queryNo, MongoOper.LIKE);
	107	+ MongoCondition con6 = MongoCondition.newInstance("sINCard", queryNo, MongoOper.LIKE);
	108	+ MongoCondition con7 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.LIKE);
	109	+ condition = condition.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5, con6, con7});
	110	+ }
	111	+
127	112	Criteria c = null;
128	113
129	114	if (null != createdStart && createdEnd != null) {
...	...	@@ -162,6 +147,15 @@
162	147	return condition.toMongoQuery();
163	148	}
164	149
	150	+
	151	+ public String getQueryNo() {
	152	+ return queryNo;
	153	+ }
	154	+
	155	+ public void setQueryNo(String queryNo) {
	156	+ this.queryNo = queryNo;
	157	+ }
	158	+
165	159	public String getId() {
166	160	return id;
167	161	}
168	162
...	...	@@ -219,44 +213,12 @@
219	213	this.isCheck = isCheck;
220	214	}
221	215
222		- public String getName() {
223		- return name;
224		- }
225		-
226		- public void setName(String name) {
227		- this.name = name;
228		- }
229		-
230	216	public Integer getSex() {
231	217	return sex;
232	218	}
233	219
234	220	public void setSex(Integer sex) {
235	221	this.sex = sex;
236		- }
237		-
238		- public String getmName() {
239		- return mName;
240		- }
241		-
242		- public void setmName(String mName) {
243		- this.mName = mName;
244		- }
245		-
246		- public String getmCardNo() {
247		- return mCardNo;
248		- }
249		-
250		- public void setmCardNo(String mCardNo) {
251		- this.mCardNo = mCardNo;
252		- }
253		-
254		- public String getmPhone() {
255		- return mPhone;
256		- }
257		-
258		- public void setmPhone(String mPhone) {
259		- this.mPhone = mPhone;
260	222	}
261	223
262	224	public String getHospitalId() {