jiangjiazhi / regional-platform

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 22 additions and 2 deletions

...	...	@@ -1046,6 +1046,7 @@
1046	1046	result.put("nasalBone", sieveApply.getNasalBone());
1047	1047	result.put("monozygous", sieveApply.getMonozygous());
1048	1048	result.put("patientType", sieveApply.getPatientType());
	1049	+ result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
1049	1050
1050	1051
1051	1052	result.put("id", sieveApply.getId());
...	...	@@ -1089,7 +1090,6 @@
1089	1090	result.put("fetusAbnormalInfo", sieveApply.getFetusAbnormalInfo());
1090	1091	result.put("sieveModel", sieveApply.getSieveModel());
1091	1092	result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek());
1092		- result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou());
1093	1093	result.put("ultrasonicNtVal", sieveApply.getUltrasonicNtVal());
1094	1094	result.put("serumScreeningRisk", sieveApply.getSerumScreeningRisk());
1095	1095	result.put("syndrome21", sieveApply.getSyndrome21());

...	...	@@ -286,7 +286,7 @@
286	286	private Integer aRMethod;
287	287	//辅助生殖之提取日期若输入了ARMethod，此项必填
288	288	private String extractionDate;
289		- // 辅助生殖之移植日期若输入了ARMethod，此项必填
	289	+ // 辅助生殖之移植日期若输入了ARMethod，此项必填applyDoctorName
290	290	private String transferDate;
291	291	//辅助生殖之捐赠者生日若输入了ARMethod，此项必填
292	292	private String donorBirthDate;
...	...	@@ -296,6 +296,26 @@
296	296	private Integer monozygous;
297	297	//孕妇筛查类型 0：一般；1：早中联合筛查孕妇
298	298	private Integer patientType;
	299	+ //采样孕周，打印功能使用
	300	+ private String caiyangyunzhou;
	301	+
	302	+ private String hospitalId;
	303	+
	304	+ public String getHospitalId() {
	305	+ return hospitalId;
	306	+ }
	307	+
	308	+ public void setHospitalId(String hospitalId) {
	309	+ this.hospitalId = hospitalId;
	310	+ }
	311	+
	312	+ public String getCaiyangyunzhou() {
	313	+ return caiyangyunzhou;
	314	+ }
	315	+
	316	+ public void setCaiyangyunzhou(String caiyangyunzhou) {
	317	+ this.caiyangyunzhou = caiyangyunzhou;
	318	+ }
299	319
300	320	public String getPatientID() {
301	321	return patientID;