jiangjiazhi / regional-platform

Authored by tranny over 5 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 21 additions and 7 deletions

...	...	@@ -56,6 +56,16 @@
56	56	return babyCheckDao.queryBabyCheckRecord(query.addOrder(Sort.Direction.DESC,"created"));
57	57	}
58	58
	59	+ public List<BabyCheckModel> queryBabyCheckRecords(BabyCheckModelQuery babyQuery) {
	60	+ MongoQuery query = babyQuery.convertToQuery();
	61	+ if (StringUtils.isNotEmpty(babyQuery.getNeed())) {
	62	+ babyQuery.mysqlBuild(babyCheckDao.queryBabyCheckCount(babyQuery.convertToQuery()));
	63	+ query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
	64	+ }
	65	+ return babyCheckDao.queryBabyCheckRecord(query);
	66	+ }
	67	+
	68	+
59	69	public List<BabyCheckModel> queryBabyCheckListRecord(BabyCheckModelQuery babyQuery) {
60	70	MongoQuery query = babyQuery.convertToQuery();
61	71	if (StringUtils.isNotEmpty(babyQuery.getNeed())) {

...	...	@@ -213,6 +213,10 @@
213	213	if (null != parentId) {
214	214	condition = condition.and("parentId", parentId, MongoOper.IS);
215	215	}
	216	+ if (null != yn) {
	217	+ condition = condition.and("yn", yn, MongoOper.IS);
	218	+ }
	219	+
216	220	if (null != hospitalId) {
217	221	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
218	222	}
...	...	@@ -225,9 +229,6 @@
225	229	}
226	230	if (CollectionUtils.isNotEmpty(parentIds)) {
227	231	condition = condition.and("parentId", parentIds, MongoOper.IN);
228		- }
229		- if (null != yn) {
230		- condition = condition.and("yn", yn, MongoOper.IS);
231	232	}
232	233	if (null != id) {
233	234	condition = condition.and("id", id, MongoOper.IS);

...	...	@@ -1852,7 +1852,10 @@
1852	1852	patient.setHstreetRegisterId("");
1853	1853	patient.setHlevelTypeId("");
1854	1854	patient.setHusbandBirth(null);
1855		- patientsService.updatePatientHusbandBirth(patient.getId(),null);
	1855	+ if (StringUtils.isNotEmpty(yunRequest.getId()))
	1856	+ {
	1857	+ patientsService.updatePatientHusbandBirth(patient.getId(),null);
	1858	+ }
1856	1859	}
1857	1860	else
1858	1861	{

...	...	@@ -310,7 +310,7 @@
310	310
311	311	System.out.println("syncAntex " + antExQuery.convertToQuery().convertToMongoQuery().toString());
312	312
313		- List<AntenatalExaminationModel> antenatalExaminationModels = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
	313	+ List<AntenatalExaminationModel> antenatalExaminationModels = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
314	314
315	315	if (CollectionUtils.isNotEmpty(antenatalExaminationModels))
316	316	{
...	...	@@ -739,7 +739,7 @@
739	739
740	740	System.out.println("syncBabyCheck " + query.convertToQuery().convertToMongoQuery().toString());
741	741	//查询儿童的检查记录
742		- List <BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(query, "checkDate", Sort.Direction.DESC);
	742	+ List <BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecords(query);
743	743
744	744	if (CollectionUtils.isNotEmpty(checkModels))
745	745	{