jiangjiazhi / regional-platform

Authored by liquanyu almost 8 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 31 additions and 2 deletions

...	...	@@ -27,6 +27,7 @@
27	27	private String keyword;
28	28
29	29	private String mphone;
	30	+ private String mphoneOrFphone;
30	31	private String mname;
31	32	private String communityId;
32	33
...	...	@@ -57,6 +58,14 @@
57	58
58	59	private String phoneOrcardNo;
59	60
	61	+ public String getMphoneOrFphone() {
	62	+ return mphoneOrFphone;
	63	+ }
	64	+
	65	+ public void setMphoneOrFphone(String mphoneOrFphone) {
	66	+ this.mphoneOrFphone = mphoneOrFphone;
	67	+ }
	68	+
60	69	public String getPhoneOrcardNo() {
61	70	return phoneOrcardNo;
62	71	}
...	...	@@ -611,6 +620,11 @@
611	620	if (!StringUtils.isEmpty(phoneId) \|\| !StringUtils.isEmpty(cardId)) {
612	621	MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE);
613	622	MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE);
	623	+ condition = condition.orCondition(new MongoCondition[]{con1, con});
	624	+ }
	625	+ if (!StringUtils.isEmpty(mphoneOrFphone)) {
	626	+ MongoCondition con1 = MongoCondition.newInstance("mphone", mphoneOrFphone, MongoOper.IS);
	627	+ MongoCondition con = MongoCondition.newInstance("fphone", mphoneOrFphone, MongoOper.IS);
614	628	condition = condition.orCondition(new MongoCondition[]{con1, con});
615	629	}
616	630

...	...	@@ -198,6 +198,7 @@
198	198	@RequestParam(value = "highRiskType", required = false) Integer highRiskType,
199	199	@RequestParam(value = "diagnose", required = false) String diagnose,
200	200	@RequestParam(value = "dateRange", required = false) String dateRange,
	201	+ @RequestParam(value = "vcCardNo", required = false) String vcCardNo,
201	202	@RequestParam("page") Integer page,
202	203	@RequestParam("limit") Integer limit,
203	204
...	...	@@ -227,6 +228,7 @@
227	228	request.setPage(page);
228	229	request.setServiceStatus(serviceStatus);
229	230	request.setDateRange(dateRange);
	231	+ request.setVcCardNo(vcCardNo);
230	232
231	233	// 省
232	234	request.setProvinceId(provinceId);

...	...	@@ -1461,7 +1461,7 @@
1461	1461	System.out.println("hisPatient phone = " + babyHis.get("phone").toString());
1462	1462	BabyModelQuery babyModelQuery = new BabyModelQuery();
1463	1463	babyModelQuery.setYn(YnEnums.YES.getId());
1464		- babyModelQuery.setMphone(babyHis.get("phone").toString());
	1464	+ babyModelQuery.setMphoneOrFphone(babyHis.get("phone").toString());
1465	1465	if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))){
1466	1466	List list = new ArrayList();
1467	1467	list.add("1");
...	...	@@ -1916,6 +1916,7 @@
1916	1916	babyQuery.setCardNo(request.getBcardNo());
1917	1917	babyQuery.setName(request.getName());
1918	1918	babyQuery.setMphone(request.getMphone());
	1919	+ babyQuery.setVcCardNo(request.getVcCardNo());
1919	1920	Date currentDate = DateUtil.formatDate(new Date());
1920	1921
1921	1922

...	...	@@ -805,7 +805,8 @@
805	805	if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString())) {
806	806	babyQuery.setPhoneOrcardNo(null); //手机号码或者身份证号码
807	807	babyQuery.setVcCardNo(null);
808		- babyQuery.setMphone(babyHis.get("phone").toString());
	808	+ //babyQuery.setMphone(babyHis.get("phone").toString());
	809	+ babyQuery.setMphoneOrFphone(babyHis.get("phone").toString());
809	810	models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
810	811	}
811	812	}

...	...	@@ -56,6 +56,9 @@
56	56	//诊断
57	57	private String diagnose;
58	58
	59	+ //就诊卡号
	60	+ private String vcCardNo;
	61	+
59	62	private String dateRange;
60	63
61	64	private String provinceId;
...	...	@@ -79,6 +82,14 @@
79	82
80	83	//评价
81	84	private String evaluate;
	85	+
	86	+ public String getVcCardNo() {
	87	+ return vcCardNo;
	88	+ }
	89	+
	90	+ public void setVcCardNo(String vcCardNo) {
	91	+ this.vcCardNo = vcCardNo;
	92	+ }
82	93
83	94	public String getItemType() {
84	95	return itemType;