jiangjiazhi / regional-platform

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 51 additions and 3 deletions

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.common.utils.*;
8	8	import com.lyms.platform.pojo.*;
9	9	import com.mongodb.Mongo;
	10	+import com.mongodb.WriteResult;
10	11	import org.apache.commons.codec.binary.Base64;
11	12	import org.apache.commons.lang.StringUtils;
12	13	import org.slf4j.Logger;
...	...	@@ -108,7 +109,7 @@
108	109	}
109	110	Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(obj));
110	111	Assert.notNull(update, "execute update method must not null.");
111		- mongoTemplate.updateMulti(new MongoQuery(new MongoCondition("id", LymsEncodeUtil.aesDecrypt(id, mongo_crypto_key), MongoOper.IS)).convertToMongoQuery(), update, cla);
	112	+ WriteResult result = mongoTemplate.upsert(new MongoQuery(new MongoCondition("id", LymsEncodeUtil.aesDecrypt(id, mongo_crypto_key), MongoOper.IS)).convertToMongoQuery(), update, cla);
112	113	return true;
113	114	} else if ("DELETE".equals(action)) {
114	115	Class cla = Class.forName(LymsEncodeUtil.aesDecrypt(className, mongo_crypto_key));

...	...	@@ -822,5 +822,20 @@
822	822	return babyBookbuildingFacade.getBabyDisease(id);
823	823
824	824	}
	825	+
	826	+
	827	+
	828	+ /**
	829	+ * 小程序获儿童分娩档案信息
	830	+ * @param phone
	831	+ * @return
	832	+ */
	833	+ @RequestMapping(value = "/getBabyAppBuildInfo", method = RequestMethod.GET)
	834	+ @ResponseBody
	835	+ public BaseResponse getBabyAppBuildInfo(@RequestParam(required = true) String phone) {
	836	+
	837	+ return babyBookbuildingFacade.getBabyAppBuildInfo(phone);
	838	+
	839	+ }
825	840	}

...	...	@@ -4980,5 +4980,35 @@
4980	4980	}
4981	4981	return diseases;
4982	4982	}
	4983	+
	4984	+ public BaseResponse getBabyAppBuildInfo(String phone) {
	4985	+
	4986	+ BabyModelQuery babyModelQuery3 = new BabyModelQuery();
	4987	+ babyModelQuery3.setDataStatus(true);
	4988	+ babyModelQuery3.setMphone(phone);
	4989	+ babyModelQuery3.setBuildType(2);
	4990	+ List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery3);
	4991	+ List<Map> datas = new ArrayList<>();
	4992	+ if (CollectionUtils.isNotEmpty(babyModels))
	4993	+ {
	4994	+ for (BabyModel model : babyModels)
	4995	+ {
	4996	+ Map data = new HashMap();
	4997	+ data.put("id",model.getId());
	4998	+ data.put("phone", model.getMphone());
	4999	+ data.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth()));
	5000	+ data.put("babyName",model.getName());
	5001	+ data.put("mommyName", model.getMname());
	5002	+ data.put("mommyCardNo",model.getMcertNo());
	5003	+ data.put("sex",model.getSex());
	5004	+ data.put("vcCardNo",model.getVcCardNo());
	5005	+ data.put("sINCard",model.getsINCard());
	5006	+ datas.add(data);
	5007	+ }
	5008	+ }
	5009	+
	5010	+ return new BaseObjectResponse()
	5011	+ .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas);
	5012	+ }
4983	5013	}

...	...	@@ -511,11 +511,13 @@
511	511	{
512	512	objectMap.put("hospitalName", CommonsHelper.getHospitalName(model.getHospitalId(), organizationService));
513	513	BabyModel babyModel = babyBookbuildingService.queryBabyById(model.getBabyId());
	514	+ String address = "";
514	515	if (babyModel != null)
515	516	{
516		- objectMap.put("address", CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(),
517		- babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService));
	517	+ address = CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(),
	518	+ babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService);
518	519	}
	520	+ objectMap.put("address",address );
519	521	}
520	522
521	523	// 预约时间