jiangjiazhi / regional-platform

Authored by dongqin almost 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 19 additions and 1 deletions

...	...	@@ -480,7 +480,7 @@
480	480
481	481	// 更新追访概况，作废档案转正
482	482	babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD);
483		- babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO);
	483	+ //babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO);
484	484	// 新增儿保追访和眼保追访
485	485	babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_CHECK, STATUS_TYPE_YES);
486	486	babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_EYE_CHECK, STATUS_TYPE_YES);
...	...	@@ -773,6 +773,13 @@
773	773
774	774	operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档");
775	775	model = babyBookbuildingService.addBabyBookbuilding(model);
	776	+
	777	+ // 更新追访概况，作废档案转正
	778	+ babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_BUILD);
	779	+ babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_BUILD, STATUS_TYPE_NO);
	780	+ // 新增儿保追访和眼保追访
	781	+ babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_CHECK, STATUS_TYPE_YES);
	782	+ babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_EYE_CHECK, STATUS_TYPE_YES);
776	783
777	784	//开通增值服务
778	785	PatientService patientService = new PatientService();

...	...	@@ -124,6 +124,12 @@
124	124	Map<String, Object> objectMap = BeanUtils.objectToObjectMap(model);
125	125	objectMap.put("sexStr", SexEnum.getTextById(model.getSex()));
126	126	objectMap.put("birthStr", DateUtil.getyyyy_MM_dd(model.getBirth()));
	127	+ highRiskType = model.getHighRiskType();
	128	+ if (highRiskType == 1) {
	129	+ boolean exists = mongoTemplate.exists(Query.query(Criteria.where("_id").is(model.getBabyId()).and("dataStatus").exists(true)), BabyModel.class);
	130	+ highRiskType = exists ? -1 : highRiskType;
	131	+ }
	132	+ objectMap.put("highRiskType", highRiskType);
127	133	mapList.add(objectMap);
128	134
129	135	}
...	...	@@ -758,6 +764,11 @@
758	764	boolean exists = mongoTemplate.exists(Query.query(Criteria.where(BABY_ID).is(babyModelId).and("highRiskType").ne(STATUS_TYPE_BUILD)), BabyAfterVisitStatisticsModel.class);
759	765	if (exists) {
760	766	mongoTemplate.updateFirst(query, Update.update("highRiskType", STATUS_TYPE_BUILD), BabyAfterVisitStatisticsModel.class);
	767	+ } else {
	768	+ // 新增数据
	769	+ Future<List<BabyAfterVisitStatisticsModel>> listFuture = service.submit(new BabyAfterVisitStatisticsModelWork(models, mongoTemplate, screenMapper));
	770	+ List<BabyAfterVisitStatisticsModel> statisticsModels = listFuture.get();
	771	+ mongoTemplate.insert(statisticsModels, BabyAfterVisitStatisticsModel.class);
761	772	}
762	773	}
763	774	// 预建档/临时建档