jiangjiazhi / regional-platform

Commit 1a192a970ccc1304741c1a09f1a502e3cbb998b0

Authored by shiyang about 4 years ago

Exists in master and in 6 other branches

隆化11月需求-妇女健康管理-男女婚检新加字段（全）

Showing 5 changed files with 591 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java

...	...	@@ -511,8 +511,8 @@
511	511	//梅毒特异性抗体（酶免法）15
512	512	private String tp;
513	513	/*艾滋病筛查*/
514		- //艾滋病16
515		-
	514	+ //HIV抗体（胶金体法）16
	515	+ private String lhHiv;
516	516	/*乙肝表面抗原*/
517	517	//乙肝表面抗原（酶免法）17
518	518	private String hbsag;
...	...	@@ -541,6 +541,13 @@
541	541
542	542	/************************************************************************/
543	543
	544	+ public String getLhHiv() {
	545	+ return lhHiv;
	546	+ }
	547	+
	548	+ public void setLhHiv(String lhHiv) {
	549	+ this.lhHiv = lhHiv;
	550	+ }
544	551	public String getWbc() {
545	552	return wbc;
546	553	}

...	...	@@ -259,7 +259,7 @@
259	259	public PremaritalCheckupResult getResult(PremaritalCheckup result) {
260	260	PremaritalCheckupResult checkupResult = new PremaritalCheckupResult();
261	261	//复制
262		-// BeanUtils.copy(result, checkupResult);
	262	+ BeanUtils.copy(result, checkupResult);
263	263	checkupResult.setCxNum(result.getCxNum());
264	264	checkupResult.setId(result.getId());
265	265	checkupResult.setParentId(result.getId());
...	...	@@ -664,7 +664,7 @@
664	664
665	665	PremaritalCheckup checkup = new PremaritalCheckup();
666	666	//复制
667		-// BeanUtils.copy(addRequest,checkup);
	667	+ BeanUtils.copy(addRequest,checkup);
668	668	if (model.getSex() != null && model.getSex().equals(SystemConfig.WOMAN_ID)) {
669	669	checkup.setSexType(1);
670	670	} else {
...	...	@@ -1866,7 +1866,7 @@
1866	1866	public PremaritalCheckupPageResult getPageResult(PremaritalCheckup result, ResidentsArchiveModel archiveModel) {
1867	1867	PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult();
1868	1868	//复制
1869		-// BeanUtils.copy(result, checkupResult);
	1869	+ BeanUtils.copy(result, checkupResult);
1870	1870	checkupResult.setCxNum(result.getCxNum());
1871	1871	checkupResult.setBaseSign(result.getBaseSign());
1872	1872	checkupResult.setPhysiqueSign(result.getPhysiqueSign());

...	...	@@ -460,6 +460,291 @@
460	460	//异常情况填写内容
461	461	private String abnormalTxt;
462	462
	463	+ /**
	464	+ *隆化11月男女婚检需求(1-18男女共用字段，19-27女性特有。)
	465	+ */
	466	+ /*血常规检查/
	467	+ //白细胞数目1
	468	+ private String wbc;
	469	+ //红细胞数目2
	470	+ private String rbc;
	471	+ //血小板数目3
	472	+ private String plt;
	473	+ //血红蛋白浓度4
	474	+ private String hgb;
	475	+ //中性粒细胞百分比5
	476	+ private String neuB;
	477	+ //嗜酸性粒细胞百分比6
	478	+ private String eosB;
	479	+ //嗜碱性粒细胞百分比7
	480	+ private String basB;
	481	+ //淋巴细胞百分比8
	482	+ private String lymB;
	483	+ //单核细胞百分比9
	484	+ private String monB;
	485	+ /*总胆红素*/
	486	+ //总胆红素（钒盐酸法）10
	487	+ private String tbil;
	488	+ /*直接胆红素*/
	489	+ //直接胆红素（钒盐酸法）11
	490	+ private String dbil;
	491	+ /*尿常规检查*/
	492	+ //葡萄糖12
	493	+ private String glu;
	494	+ /*血型*/
	495	+ //Rh血型13
	496	+ private String rh;
	497	+ //ABO血型14
	498	+ private String abo;
	499	+ /*梅毒筛查*/
	500	+ //梅毒特异性抗体（酶免法）15
	501	+ private String tp;
	502	+ /*艾滋病筛查*/
	503	+ //HIV抗体（胶金体法）16
	504	+ private String lhHiv;
	505	+ /*乙肝表面抗原*/
	506	+ //乙肝表面抗原（酶免法）17
	507	+ private String hbsag;
	508	+ /*转氨酶*/
	509	+ //谷丙转氨酶18
	510	+ private String alt;
	511	+ /*女性阴道分泌物*/
	512	+ //清洁度19
	513	+ private String qjd;
	514	+ //线索细胞20
	515	+ private String xsxb;
	516	+ //滴虫21
	517	+ private String dc;
	518	+ //PH值22
	519	+ private String ph;
	520	+ //念珠菌感染23
	521	+ private String nzj;
	522	+ //沙眼衣原体筛查24
	523	+ private String syyyt;
	524	+ //淋球菌筛查25
	525	+ private String lqj;
	526	+ //胺臭味试验26
	527	+ private String acwsy;
	528	+ //淋球菌筛查27
	529	+ private String lqjsc;
	530	+ /************************************************************************/
	531	+
	532	+ public String getWbc() {
	533	+ return wbc;
	534	+ }
	535	+
	536	+ public void setWbc(String wbc) {
	537	+ this.wbc = wbc;
	538	+ }
	539	+
	540	+ public String getRbc() {
	541	+ return rbc;
	542	+ }
	543	+
	544	+ public void setRbc(String rbc) {
	545	+ this.rbc = rbc;
	546	+ }
	547	+
	548	+ public String getPlt() {
	549	+ return plt;
	550	+ }
	551	+
	552	+ public void setPlt(String plt) {
	553	+ this.plt = plt;
	554	+ }
	555	+
	556	+ public String getHgb() {
	557	+ return hgb;
	558	+ }
	559	+
	560	+ public void setHgb(String hgb) {
	561	+ this.hgb = hgb;
	562	+ }
	563	+
	564	+ public String getNeuB() {
	565	+ return neuB;
	566	+ }
	567	+
	568	+ public void setNeuB(String neuB) {
	569	+ this.neuB = neuB;
	570	+ }
	571	+
	572	+ public String getEosB() {
	573	+ return eosB;
	574	+ }
	575	+
	576	+ public void setEosB(String eosB) {
	577	+ this.eosB = eosB;
	578	+ }
	579	+
	580	+ public String getBasB() {
	581	+ return basB;
	582	+ }
	583	+
	584	+ public void setBasB(String basB) {
	585	+ this.basB = basB;
	586	+ }
	587	+
	588	+ public String getLymB() {
	589	+ return lymB;
	590	+ }
	591	+
	592	+ public void setLymB(String lymB) {
	593	+ this.lymB = lymB;
	594	+ }
	595	+
	596	+ public String getMonB() {
	597	+ return monB;
	598	+ }
	599	+
	600	+ public void setMonB(String monB) {
	601	+ this.monB = monB;
	602	+ }
	603	+
	604	+ public String getTbil() {
	605	+ return tbil;
	606	+ }
	607	+
	608	+ public void setTbil(String tbil) {
	609	+ this.tbil = tbil;
	610	+ }
	611	+
	612	+ public String getDbil() {
	613	+ return dbil;
	614	+ }
	615	+
	616	+ public void setDbil(String dbil) {
	617	+ this.dbil = dbil;
	618	+ }
	619	+
	620	+ public String getGlu() {
	621	+ return glu;
	622	+ }
	623	+
	624	+ public void setGlu(String glu) {
	625	+ this.glu = glu;
	626	+ }
	627	+
	628	+ public String getRh() {
	629	+ return rh;
	630	+ }
	631	+
	632	+ public void setRh(String rh) {
	633	+ this.rh = rh;
	634	+ }
	635	+
	636	+ public String getAbo() {
	637	+ return abo;
	638	+ }
	639	+
	640	+ public void setAbo(String abo) {
	641	+ this.abo = abo;
	642	+ }
	643	+
	644	+ public String getTp() {
	645	+ return tp;
	646	+ }
	647	+
	648	+ public void setTp(String tp) {
	649	+ this.tp = tp;
	650	+ }
	651	+
	652	+ public String getLhHiv() {
	653	+ return lhHiv;
	654	+ }
	655	+
	656	+ public void setLhHiv(String lhHiv) {
	657	+ this.lhHiv = lhHiv;
	658	+ }
	659	+
	660	+ public String getHbsag() {
	661	+ return hbsag;
	662	+ }
	663	+
	664	+ public void setHbsag(String hbsag) {
	665	+ this.hbsag = hbsag;
	666	+ }
	667	+
	668	+ public String getAlt() {
	669	+ return alt;
	670	+ }
	671	+
	672	+ public void setAlt(String alt) {
	673	+ this.alt = alt;
	674	+ }
	675	+
	676	+ public String getQjd() {
	677	+ return qjd;
	678	+ }
	679	+
	680	+ public void setQjd(String qjd) {
	681	+ this.qjd = qjd;
	682	+ }
	683	+
	684	+ public String getXsxb() {
	685	+ return xsxb;
	686	+ }
	687	+
	688	+ public void setXsxb(String xsxb) {
	689	+ this.xsxb = xsxb;
	690	+ }
	691	+
	692	+ public String getDc() {
	693	+ return dc;
	694	+ }
	695	+
	696	+ public void setDc(String dc) {
	697	+ this.dc = dc;
	698	+ }
	699	+
	700	+ public String getPh() {
	701	+ return ph;
	702	+ }
	703	+
	704	+ public void setPh(String ph) {
	705	+ this.ph = ph;
	706	+ }
	707	+
	708	+ public String getNzj() {
	709	+ return nzj;
	710	+ }
	711	+
	712	+ public void setNzj(String nzj) {
	713	+ this.nzj = nzj;
	714	+ }
	715	+
	716	+ public String getSyyyt() {
	717	+ return syyyt;
	718	+ }
	719	+
	720	+ public void setSyyyt(String syyyt) {
	721	+ this.syyyt = syyyt;
	722	+ }
	723	+
	724	+ public String getLqj() {
	725	+ return lqj;
	726	+ }
	727	+
	728	+ public void setLqj(String lqj) {
	729	+ this.lqj = lqj;
	730	+ }
	731	+
	732	+ public String getAcwsy() {
	733	+ return acwsy;
	734	+ }
	735	+
	736	+ public void setAcwsy(String acwsy) {
	737	+ this.acwsy = acwsy;
	738	+ }
	739	+
	740	+ public String getLqjsc() {
	741	+ return lqjsc;
	742	+ }
	743	+
	744	+ public void setLqjsc(String lqjsc) {
	745	+ this.lqjsc = lqjsc;
	746	+ }
	747	+
463	748	public Integer getxRay() {
464	749	return xRay;
465	750	}

...	...	@@ -424,6 +424,291 @@
424	424	//异常情况填写内容
425	425	private String abnormalTxt;
426	426
	427	+ /**
	428	+ *隆化11月男女婚检需求(1-18男女共用字段，19-27女性特有。)
	429	+ */
	430	+ /*血常规检查/
	431	+ //白细胞数目1
	432	+ private String wbc;
	433	+ //红细胞数目2
	434	+ private String rbc;
	435	+ //血小板数目3
	436	+ private String plt;
	437	+ //血红蛋白浓度4
	438	+ private String hgb;
	439	+ //中性粒细胞百分比5
	440	+ private String neuB;
	441	+ //嗜酸性粒细胞百分比6
	442	+ private String eosB;
	443	+ //嗜碱性粒细胞百分比7
	444	+ private String basB;
	445	+ //淋巴细胞百分比8
	446	+ private String lymB;
	447	+ //单核细胞百分比9
	448	+ private String monB;
	449	+ /*总胆红素*/
	450	+ //总胆红素（钒盐酸法）10
	451	+ private String tbil;
	452	+ /*直接胆红素*/
	453	+ //直接胆红素（钒盐酸法）11
	454	+ private String dbil;
	455	+ /*尿常规检查*/
	456	+ //葡萄糖12
	457	+ private String glu;
	458	+ /*血型*/
	459	+ //Rh血型13
	460	+ private String rh;
	461	+ //ABO血型14
	462	+ private String abo;
	463	+ /*梅毒筛查*/
	464	+ //梅毒特异性抗体（酶免法）15
	465	+ private String tp;
	466	+ /*艾滋病筛查*/
	467	+ //HIV抗体（胶金体法）16
	468	+ private String lhHiv;
	469	+ /*乙肝表面抗原*/
	470	+ //乙肝表面抗原（酶免法）17
	471	+ private String hbsag;
	472	+ /*转氨酶*/
	473	+ //谷丙转氨酶18
	474	+ private String alt;
	475	+ /*女性阴道分泌物*/
	476	+ //清洁度19
	477	+ private String qjd;
	478	+ //线索细胞20
	479	+ private String xsxb;
	480	+ //滴虫21
	481	+ private String dc;
	482	+ //PH值22
	483	+ private String ph;
	484	+ //念珠菌感染23
	485	+ private String nzj;
	486	+ //沙眼衣原体筛查24
	487	+ private String syyyt;
	488	+ //淋球菌筛查25
	489	+ private String lqj;
	490	+ //胺臭味试验26
	491	+ private String acwsy;
	492	+ //淋球菌筛查27
	493	+ private String lqjsc;
	494	+ /************************************************************************/
	495	+
	496	+ public String getWbc() {
	497	+ return wbc;
	498	+ }
	499	+
	500	+ public void setWbc(String wbc) {
	501	+ this.wbc = wbc;
	502	+ }
	503	+
	504	+ public String getRbc() {
	505	+ return rbc;
	506	+ }
	507	+
	508	+ public void setRbc(String rbc) {
	509	+ this.rbc = rbc;
	510	+ }
	511	+
	512	+ public String getPlt() {
	513	+ return plt;
	514	+ }
	515	+
	516	+ public void setPlt(String plt) {
	517	+ this.plt = plt;
	518	+ }
	519	+
	520	+ public String getHgb() {
	521	+ return hgb;
	522	+ }
	523	+
	524	+ public void setHgb(String hgb) {
	525	+ this.hgb = hgb;
	526	+ }
	527	+
	528	+ public String getNeuB() {
	529	+ return neuB;
	530	+ }
	531	+
	532	+ public void setNeuB(String neuB) {
	533	+ this.neuB = neuB;
	534	+ }
	535	+
	536	+ public String getEosB() {
	537	+ return eosB;
	538	+ }
	539	+
	540	+ public void setEosB(String eosB) {
	541	+ this.eosB = eosB;
	542	+ }
	543	+
	544	+ public String getBasB() {
	545	+ return basB;
	546	+ }
	547	+
	548	+ public void setBasB(String basB) {
	549	+ this.basB = basB;
	550	+ }
	551	+
	552	+ public String getLymB() {
	553	+ return lymB;
	554	+ }
	555	+
	556	+ public void setLymB(String lymB) {
	557	+ this.lymB = lymB;
	558	+ }
	559	+
	560	+ public String getMonB() {
	561	+ return monB;
	562	+ }
	563	+
	564	+ public void setMonB(String monB) {
	565	+ this.monB = monB;
	566	+ }
	567	+
	568	+ public String getTbil() {
	569	+ return tbil;
	570	+ }
	571	+
	572	+ public void setTbil(String tbil) {
	573	+ this.tbil = tbil;
	574	+ }
	575	+
	576	+ public String getDbil() {
	577	+ return dbil;
	578	+ }
	579	+
	580	+ public void setDbil(String dbil) {
	581	+ this.dbil = dbil;
	582	+ }
	583	+
	584	+ public String getGlu() {
	585	+ return glu;
	586	+ }
	587	+
	588	+ public void setGlu(String glu) {
	589	+ this.glu = glu;
	590	+ }
	591	+
	592	+ public String getRh() {
	593	+ return rh;
	594	+ }
	595	+
	596	+ public void setRh(String rh) {
	597	+ this.rh = rh;
	598	+ }
	599	+
	600	+ public String getAbo() {
	601	+ return abo;
	602	+ }
	603	+
	604	+ public void setAbo(String abo) {
	605	+ this.abo = abo;
	606	+ }
	607	+
	608	+ public String getTp() {
	609	+ return tp;
	610	+ }
	611	+
	612	+ public void setTp(String tp) {
	613	+ this.tp = tp;
	614	+ }
	615	+
	616	+ public String getLhHiv() {
	617	+ return lhHiv;
	618	+ }
	619	+
	620	+ public void setLhHiv(String lhHiv) {
	621	+ this.lhHiv = lhHiv;
	622	+ }
	623	+
	624	+ public String getHbsag() {
	625	+ return hbsag;
	626	+ }
	627	+
	628	+ public void setHbsag(String hbsag) {
	629	+ this.hbsag = hbsag;
	630	+ }
	631	+
	632	+ public String getAlt() {
	633	+ return alt;
	634	+ }
	635	+
	636	+ public void setAlt(String alt) {
	637	+ this.alt = alt;
	638	+ }
	639	+
	640	+ public String getQjd() {
	641	+ return qjd;
	642	+ }
	643	+
	644	+ public void setQjd(String qjd) {
	645	+ this.qjd = qjd;
	646	+ }
	647	+
	648	+ public String getXsxb() {
	649	+ return xsxb;
	650	+ }
	651	+
	652	+ public void setXsxb(String xsxb) {
	653	+ this.xsxb = xsxb;
	654	+ }
	655	+
	656	+ public String getDc() {
	657	+ return dc;
	658	+ }
	659	+
	660	+ public void setDc(String dc) {
	661	+ this.dc = dc;
	662	+ }
	663	+
	664	+ public String getPh() {
	665	+ return ph;
	666	+ }
	667	+
	668	+ public void setPh(String ph) {
	669	+ this.ph = ph;
	670	+ }
	671	+
	672	+ public String getNzj() {
	673	+ return nzj;
	674	+ }
	675	+
	676	+ public void setNzj(String nzj) {
	677	+ this.nzj = nzj;
	678	+ }
	679	+
	680	+ public String getSyyyt() {
	681	+ return syyyt;
	682	+ }
	683	+
	684	+ public void setSyyyt(String syyyt) {
	685	+ this.syyyt = syyyt;
	686	+ }
	687	+
	688	+ public String getLqj() {
	689	+ return lqj;
	690	+ }
	691	+
	692	+ public void setLqj(String lqj) {
	693	+ this.lqj = lqj;
	694	+ }
	695	+
	696	+ public String getAcwsy() {
	697	+ return acwsy;
	698	+ }
	699	+
	700	+ public void setAcwsy(String acwsy) {
	701	+ this.acwsy = acwsy;
	702	+ }
	703	+
	704	+ public String getLqjsc() {
	705	+ return lqjsc;
	706	+ }
	707	+
	708	+ public void setLqjsc(String lqjsc) {
	709	+ this.lqjsc = lqjsc;
	710	+ }
	711	+
427	712	public Integer getxRay() {
428	713	return xRay;
429	714	}

...	...	@@ -475,8 +475,8 @@
475	475	//梅毒特异性抗体（酶免法）15
476	476	private String tp;
477	477	/*艾滋病筛查*/
478		- //艾滋病16
479		-
	478	+ //HIV抗体（胶金体法）16
	479	+ private String lhHiv;
480	480	/*乙肝表面抗原*/
481	481	//乙肝表面抗原（酶免法）17
482	482	private String hbsag;
...	...	@@ -503,6 +503,13 @@
503	503	//淋球菌筛查27
504	504	private String lqjsc;
505	505	/************************************************************************/
	506	+ public String getLhHiv() {
	507	+ return lhHiv;
	508	+ }
	509	+
	510	+ public void setLhHiv(String lhHiv) {
	511	+ this.lhHiv = lhHiv;
	512	+ }
506	513
507	514	public String getWbc() {
508	515	return wbc;