jiangjiazhi / regional-platform

Authored by liquanyu over 8 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 33 additions and 0 deletions

...	...	@@ -175,7 +175,16 @@
175	175	//诊断
176	176	private String lastDiagnose;
177	177
	178	+ private List<Integer> buildTypeList;
178	179
	180	+ public List<Integer> getBuildTypeList() {
	181	+ return buildTypeList;
	182	+ }
	183	+
	184	+ public void setBuildTypeList(List<Integer> buildTypeList) {
	185	+ this.buildTypeList = buildTypeList;
	186	+ }
	187	+
179	188	public String getLastDiagnose() {
180	189	return lastDiagnose;
181	190	}
...	...	@@ -369,6 +378,15 @@
369	378	MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE);
370	379	MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE);
371	380	condition = condition.orCondition(new MongoCondition[]{con1, con});
	381	+ }
	382	+
	383	+ if(null != buildTypeList) {
	384	+ MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS);
	385	+ MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS);
	386	+
	387	+ MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN);
	388	+
	389	+ condition = condition.orCondition(new MongoCondition[]{condition1, condition2});
372	390	}
373	391
374	392	if(null!=sex){

...	...	@@ -397,6 +397,10 @@
397	397	babyQuery.setYn(YnEnums.YES.getId());
398	398	babyQuery.setHospitalId(hospitalId);
399	399
	400	+// List buildType = new ArrayList();
	401	+// buildType.add(1);
	402	+// buildType.add(2);
	403	+// babyQuery.setBuildTypeList(buildType);
400	404
401	405	//儿童年龄满三岁就不在提供短信服务
402	406	Date birthdayMax = DateUtil.addYear(new Date(), -3);

...	...	@@ -1569,6 +1569,12 @@
1569	1569
1570	1570	private List<BabyModel> getBabayListByCondition(BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) {
1571	1571
	1572	+
	1573	+ List buildType = new ArrayList();
	1574	+ buildType.add(1);
	1575	+ buildType.add(2);
	1576	+ babyQuery.setBuildTypeList(buildType);
	1577	+
1572	1578	babyQuery.setYn(YnEnums.YES.getId());
1573	1579	if (isPage) {
1574	1580	babyQuery.setNeed("true");

...	...	@@ -258,6 +258,11 @@
258	258	babyModelQuery.setBuildType(3);
259	259	List<BabyModel> babyModelList= babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
260	260	if(CollectionUtils.isNotEmpty(babyModelList)){
	261	+
	262	+ BabyModel babyModel = new BabyModel();
	263	+ babyModel.setEnable("1");
	264	+ babyBookbuildingService.updateBabyBuild(babyModel,babyModelList.get(0).getId());
	265	+
261	266	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
262	267	referralApplyOrderQuery.setParentId(request.getBuildId());
263	268	String hospital =babyModelList.get(0).getHospitalId();