jiangjiazhi / regional-platform

Authored by zhangchao over 1 year ago

Exists in dev

Showing 3 changed files with 37 additions and 3 deletions

...	...	@@ -414,6 +414,7 @@
414	414
415	415	patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
416	416	patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode());
	417	+ System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
417	418	patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
418	419
419	420	if (CollectionUtils.isEmpty(patientses)) {
420	421
...	...	@@ -443,10 +444,9 @@
443	444	parentIds.add(pa.getId());
444	445	}
445	446	antExRecordQuery.setParentIds(parentIds);
446		- } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {
	447	+ } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo()) \|\| StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) {
447	448	return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo());
448	449	}
449		-
450	450	String hospital = autoMatchFacade.getHospitalId(userId);
451	451	List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
452	452	List<AntExManagerResult> data = getAntExRecords(antExRecordModelList, hospital, isRegion, antExManagerQueryRequest.getShowDetail());

...	...	@@ -370,6 +370,36 @@
370	370	//存活胎儿数
371	371	private Integer survFetus;
372	372
	373	+
	374	+ //大同高危手册
	375	+ private String other;//高危手册初诊其他
	376	+ private String symptoms;//高危手册症状与体征
	377	+ private String otherCheck;//高危手册其他检查项
	378	+
	379	+ public String getOther() {
	380	+ return other;
	381	+ }
	382	+
	383	+ public void setOther(String other) {
	384	+ this.other = other;
	385	+ }
	386	+
	387	+ public String getSymptoms() {
	388	+ return symptoms;
	389	+ }
	390	+
	391	+ public void setSymptoms(String symptoms) {
	392	+ this.symptoms = symptoms;
	393	+ }
	394	+
	395	+ public String getOtherCheck() {
	396	+ return otherCheck;
	397	+ }
	398	+
	399	+ public void setOtherCheck(String otherCheck) {
	400	+ this.otherCheck = otherCheck;
	401	+ }
	402	+
373	403	public String getZyzlState() {
374	404	return zyzlState;
375	405	}
...	...	@@ -2532,6 +2562,10 @@
2532	2562	setFollowupDoctorName(antExChuModel.getFollowupDoctorName());
2533	2563	setFollowupDate(antExChuModel.getFollowupDate());
2534	2564	setName(antExChuModel.getName());
	2565	+
	2566	+ setOther(antExChuModel.getOther());
	2567	+ setOtherCheck(antExChuModel.getOtherCheck());
	2568	+ setSymptoms(antExChuModel.getSymptoms());
2535	2569	}
2536	2570	return this;
2537	2571	}

...	...	@@ -791,7 +791,7 @@
791	791	setCfyc(destModel.getCfyc());
792	792
793	793	setBabySize(destModel.getBabySize());
794		- setPerinealCondition(destModel.getPerinealCondition());
	794	+ setPelvicCondition(destModel.getPelvicCondition());
795	795	setCurrentCondition(destModel.getCurrentCondition());
796	796	setDtDiagnosis(destModel.getDtDiagnosis());
797	797	setAdvice(destModel.getAdvice());