jiangjiazhi / regional-platform

Authored by yangfei about 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 16 additions and 1 deletions

...	...	@@ -682,9 +682,14 @@
682	682	patientsQuery.setCardNo(patientQueryRequest.getCardNo());
683	683
684	684	Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(), patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), -1, true, patientQueryRequest.getPid(), false);
	685	+
	686	+
	687	+
685	688	PatientBaseResult patientBaseResult = new PatientBaseResult();
686	689	if (null != patients) {
687	690	patientBaseResult.convert(patients);
	691	+ List<Map<String, Object>> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult());
	692	+ patientBaseResult.setScreenResult(screenList);
688	693	}
689	694	try {
690	695	HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);

...	...	@@ -6,6 +6,7 @@
6	6
7	7	import java.util.Date;
8	8	import java.util.List;
	9	+import java.util.Map;
9	10
10	11	/**
11	12	* Created by Administrator on 2016/7/10 0010.
12	13
...	...	@@ -43,11 +44,20 @@
43	44	private String lastMenses;
44	45	//1 孕妇 0 产妇
45	46	private String isGravida;
46		-
	47	+ //筛查结果
	48	+ private List<Map<String, Object>> screenResult;
47	49	// 身高
48	50	private String height;
49	51	//体重
50	52	private String weight ;
	53	+
	54	+ public List<Map<String, Object>> getScreenResult() {
	55	+ return screenResult;
	56	+ }
	57	+
	58	+ public void setScreenResult(List<Map<String, Object>> screenResult) {
	59	+ this.screenResult = screenResult;
	60	+ }
51	61
52	62	public String getHeight() {
53	63	return height;