jiangjiazhi / regional-platform

Authored by shiyang almost 4 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 151 additions and 0 deletions

...	...	@@ -479,6 +479,20 @@
479	479	//操作人id
480	480	private String operaterUserId;
481	481
	482	+ /**
	483	+ * 围场-孕产妇产检页面新加字段
	484	+ */
	485	+ //NT检查
	486	+ private String ntWoman;
	487	+
	488	+ public String getNtWoman() {
	489	+ return ntWoman;
	490	+ }
	491	+
	492	+ public void setNtWoman(String ntWoman) {
	493	+ this.ntWoman = ntWoman;
	494	+ }
	495	+
482	496	public String getOperaterUserId() {
483	497	return operaterUserId;
484	498	}

...	...	@@ -372,6 +372,20 @@
372	372	//操作人id
373	373	private String operaterUserId;
374	374
	375	+ /**
	376	+ * 围场孕妇产检新加字段
	377	+ */
	378	+ //孕妇NT
	379	+ private String wcNt;
	380	+
	381	+ public String getWcNt() {
	382	+ return wcNt;
	383	+ }
	384	+
	385	+ public void setWcNt(String wcNt) {
	386	+ this.wcNt = wcNt;
	387	+ }
	388	+
375	389	public String getOperaterUserId() {
376	390	return operaterUserId;
377	391	}

...	...	@@ -598,6 +598,40 @@
598	598	//最后儿保检查医生
599	599	private String lastCheckDoctor;
600	600
	601	+ /**
	602	+ * 围场出院小结页面新增字段
	603	+ */
	604	+ //耳聋基因筛查 0：未筛查，1：已筛查
	605	+ private Integer deafnessGene;
	606	+ //筛查日期
	607	+ private String deafnessGeneDate;
	608	+ //检查医生
	609	+ private String deafnessCheckDoctor;
	610	+
	611	+ public Integer getDeafnessGene() {
	612	+ return deafnessGene;
	613	+ }
	614	+
	615	+ public void setDeafnessGene(Integer deafnessGene) {
	616	+ this.deafnessGene = deafnessGene;
	617	+ }
	618	+
	619	+ public String getDeafnessGeneDate() {
	620	+ return deafnessGeneDate;
	621	+ }
	622	+
	623	+ public void setDeafnessGeneDate(String deafnessGeneDate) {
	624	+ this.deafnessGeneDate = deafnessGeneDate;
	625	+ }
	626	+
	627	+ public String getDeafnessCheckDoctor() {
	628	+ return deafnessCheckDoctor;
	629	+ }
	630	+
	631	+ public void setDeafnessCheckDoctor(String deafnessCheckDoctor) {
	632	+ this.deafnessCheckDoctor = deafnessCheckDoctor;
	633	+ }
	634	+
601	635	public String getFirstPyName() {
602	636	return firstPyName;
603	637	}

...	...	@@ -199,6 +199,40 @@
199	199
200	200	private Integer yn;
201	201
	202	+ /**
	203	+ * 围场出院小结页面新增字段
	204	+ */
	205	+ //耳聋基因筛查 0：未筛查，1：已筛查
	206	+ private Integer deafnessGene;
	207	+ //筛查日期
	208	+ private String deafnessGeneDate;
	209	+ //检查医生
	210	+ private String deafnessCheckDoctor;
	211	+
	212	+ public Integer getDeafnessGene() {
	213	+ return deafnessGene;
	214	+ }
	215	+
	216	+ public void setDeafnessGene(Integer deafnessGene) {
	217	+ this.deafnessGene = deafnessGene;
	218	+ }
	219	+
	220	+ public String getDeafnessGeneDate() {
	221	+ return deafnessGeneDate;
	222	+ }
	223	+
	224	+ public void setDeafnessGeneDate(String deafnessGeneDate) {
	225	+ this.deafnessGeneDate = deafnessGeneDate;
	226	+ }
	227	+
	228	+ public String getDeafnessCheckDoctor() {
	229	+ return deafnessCheckDoctor;
	230	+ }
	231	+
	232	+ public void setDeafnessCheckDoctor(String deafnessCheckDoctor) {
	233	+ this.deafnessCheckDoctor = deafnessCheckDoctor;
	234	+ }
	235	+
202	236	public String getIsHighRisk() {
203	237	return isHighRisk;
204	238	}

...	...	@@ -3284,6 +3284,7 @@
3284	3284	map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL));
3285	3285	map.put("urineProtein", data.getUrineProtein());
3286	3286	map.put("bChao", data.getbChao());
	3287	+ map.put("wcNt",data.getWcNt());
3287	3288
3288	3289	/* 诊断指导 */
3289	3290	String diagnosis = "";
...	...	@@ -5316,6 +5317,10 @@
5316	5317	babyMap.put("isCH", FunvCommonUtil.checkIsScreening(temp.getIsCH()));
5317	5318	babyMap.put("isUNHS", FunvCommonUtil.checkIsScreening(temp.getIsUNHS()));
5318	5319	babyMap.put("hearScrResult", temp.getHearScrResult());
	5320	+ /* 围场出院小结新加字段耳聋基因 20210817*/
	5321	+ babyMap.put("deafnessGene",FunvCommonUtil.checkIsScreening(temp.getDeafnessGene()));
	5322	+ babyMap.put("deafnessGeneDate",(temp.getDeafnessGeneDate()));
	5323	+ babyMap.put("deafnessCheckDoctor",(temp.getDeafnessCheckDoctor()));
5319	5324
5320	5325	/滦平start 20201103 /
5321	5326	babyMap.put("esfs", temp.getEsfs());

...	...	@@ -357,6 +357,20 @@
357	357	//操作人id
358	358	private String operaterUserId;
359	359
	360	+ /**
	361	+ * 围场孕妇产检新加字段
	362	+ */
	363	+ //孕妇NT
	364	+ private String wcNt;
	365	+
	366	+ public String getWcNt() {
	367	+ return wcNt;
	368	+ }
	369	+
	370	+ public void setWcNt(String wcNt) {
	371	+ this.wcNt = wcNt;
	372	+ }
	373	+
360	374	public String getOperaterUserId() {
361	375	return operaterUserId;
362	376	}
...	...	@@ -1296,6 +1310,7 @@
1296	1310	examinationModel.setHemoglobin(hemoglobin);
1297	1311	examinationModel.setUrineProtein(urineProtein);
1298	1312	examinationModel.setbChao(bChao);
	1313	+ examinationModel.setWcNt(wcNt);
1299	1314	examinationModel.setBloodSugar(bloodSugar);
1300	1315	examinationModel.setBloodSugar2(bloodSugar2);
1301	1316	examinationModel.setBloodSugar3(bloodSugar3);

...	...	@@ -251,6 +251,41 @@
251	251	*/
252	252	private String orderScreenDescription;
253	253
	254	+
	255	+ /**
	256	+ * 围场出院小结页面新增字段
	257	+ */
	258	+ //耳聋基因筛查 0：未筛查，1：已筛查
	259	+ private Integer deafnessGene;
	260	+ //筛查日期
	261	+ private String deafnessGeneDate;
	262	+ //检查医生
	263	+ private String deafnessCheckDoctor;
	264	+
	265	+ public Integer getDeafnessGene() {
	266	+ return deafnessGene;
	267	+ }
	268	+
	269	+ public void setDeafnessGene(Integer deafnessGene) {
	270	+ this.deafnessGene = deafnessGene;
	271	+ }
	272	+
	273	+ public String getDeafnessGeneDate() {
	274	+ return deafnessGeneDate;
	275	+ }
	276	+
	277	+ public void setDeafnessGeneDate(String deafnessGeneDate) {
	278	+ this.deafnessGeneDate = deafnessGeneDate;
	279	+ }
	280	+
	281	+ public String getDeafnessCheckDoctor() {
	282	+ return deafnessCheckDoctor;
	283	+ }
	284	+
	285	+ public void setDeafnessCheckDoctor(String deafnessCheckDoctor) {
	286	+ this.deafnessCheckDoctor = deafnessCheckDoctor;
	287	+ }
	288	+
254	289	public String getIsHighRisk() {
255	290	return isHighRisk;
256	291	}