jiangjiazhi / regional-platform

Commit a64bfc8c73de954763bbe7baeb768f572ebe8305

Authored by jiangjiazhi about 8 years ago

Exists in master and in 6 other branches

删除最后一次顿号

Showing 2 changed files with 145 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -86,6 +86,67 @@
86	86	private int hasSieve;
87	87	private String cDueWeek;
88	88
	89	+ // //早孕期病毒检测
	90	+ private String zyqbdjc;
	91	+// //nt检查
	92	+ private String ntjc;
	93	+ //产前筛查
	94	+ private String cjsc;
	95	+// //胎儿系统排畸b吵
	96	+ private String textpjbc;
	97	+ //75gODTT
	98	+ private String s75gdgtt;
	99	+// //甲状腺功能
	100	+ private String jzxgn;
	101	+
	102	+ public String getZyqbdjc() {
	103	+ return zyqbdjc;
	104	+ }
	105	+
	106	+ public void setZyqbdjc(String zyqbdjc) {
	107	+ this.zyqbdjc = zyqbdjc;
	108	+ }
	109	+
	110	+ public String getNtjc() {
	111	+ return ntjc;
	112	+ }
	113	+
	114	+ public void setNtjc(String ntjc) {
	115	+ this.ntjc = ntjc;
	116	+ }
	117	+
	118	+ public String getCjsc() {
	119	+ return cjsc;
	120	+ }
	121	+
	122	+ public void setCjsc(String cjsc) {
	123	+ this.cjsc = cjsc;
	124	+ }
	125	+
	126	+ public String getTextpjbc() {
	127	+ return textpjbc;
	128	+ }
	129	+
	130	+ public void setTextpjbc(String textpjbc) {
	131	+ this.textpjbc = textpjbc;
	132	+ }
	133	+
	134	+ public String getS75gdgtt() {
	135	+ return s75gdgtt;
	136	+ }
	137	+
	138	+ public void setS75gdgtt(String s75gdgtt) {
	139	+ this.s75gdgtt = s75gdgtt;
	140	+ }
	141	+
	142	+ public String getJzxgn() {
	143	+ return jzxgn;
	144	+ }
	145	+
	146	+ public void setJzxgn(String jzxgn) {
	147	+ this.jzxgn = jzxgn;
	148	+ }
	149	+
89	150	public String getDiagnosisOther() {
90	151	return diagnosisOther;
91	152	}
...	...	@@ -156,6 +217,12 @@
156	217	setBloodSugar2(destModel.getBloodSugar2());
157	218	setBloodSugar3(destModel.getBloodSugar3());
158	219	setBloodSugar4(destModel.getBloodSugar4());
	220	+ setZyqbdjc(destModel.getZyqbd());
	221	+ setNtjc(destModel.getNtjc());
	222	+ setCjsc(destModel.getCjsc());
	223	+ setTextpjbc(destModel.getTextpjbc());
	224	+ setS75gdgtt(destModel.getS75gdgtt());
	225	+ setJzxgn(destModel.getJzxgn());
159	226	try {
160	227	setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
161	228	} catch (Exception e) {

...	...	@@ -230,6 +230,19 @@
230	230	private int hasRefer;
231	231	//是否有产筛
232	232	private int hasSieve;
	233	+
	234	+ //早孕期病毒检测
	235	+ private String zyqbdjc;
	236	+ //nt检查
	237	+ private String ntjc;
	238	+ //产前筛查
	239	+ private String cjsc;
	240	+ //胎儿系统排畸b吵
	241	+ private String textpjbc;
	242	+ //75gODTT
	243	+ private String s75gdgtt;
	244	+ //甲状腺功能
	245	+ private String jzxgn;
233	246	/**
234	247	* 其他的诊断意见
235	248	*/
236	249
...	...	@@ -801,7 +814,54 @@
801	814	this.xqjq = xqjq;
802	815	}
803	816
	817	+ public String getZyqbdjc() {
	818	+ return zyqbdjc;
	819	+ }
804	820
	821	+ public void setZyqbdjc(String zyqbdjc) {
	822	+ this.zyqbdjc = zyqbdjc;
	823	+ }
	824	+
	825	+ public String getNtjc() {
	826	+ return ntjc;
	827	+ }
	828	+
	829	+ public void setNtjc(String ntjc) {
	830	+ this.ntjc = ntjc;
	831	+ }
	832	+
	833	+ public String getCjsc() {
	834	+ return cjsc;
	835	+ }
	836	+
	837	+ public void setCjsc(String cjsc) {
	838	+ this.cjsc = cjsc;
	839	+ }
	840	+
	841	+ public String getTextpjbc() {
	842	+ return textpjbc;
	843	+ }
	844	+
	845	+ public void setTextpjbc(String textpjbc) {
	846	+ this.textpjbc = textpjbc;
	847	+ }
	848	+
	849	+ public String getS75gdgtt() {
	850	+ return s75gdgtt;
	851	+ }
	852	+
	853	+ public void setS75gdgtt(String s75gdgtt) {
	854	+ this.s75gdgtt = s75gdgtt;
	855	+ }
	856	+
	857	+ public String getJzxgn() {
	858	+ return jzxgn;
	859	+ }
	860	+
	861	+ public void setJzxgn(String jzxgn) {
	862	+ this.jzxgn = jzxgn;
	863	+ }
	864	+
805	865	public Map getYdfmw() {
806	866	return ydfmw;
807	867	}
...	...	@@ -968,6 +1028,24 @@
968	1028	setBarCode(antExChuModel.getBarCode());
969	1029	setId(antExChuModel.getId());
970	1030	setParentId(antExChuModel.getParentId());
	1031	+// //早孕期病毒检测
	1032	+// private String zyqbdjc;
	1033	+// //nt检查
	1034	+// private String ntjc;
	1035	+// //产前筛查
	1036	+// private String cjsc;
	1037	+// //胎儿系统排畸b吵
	1038	+// private String textpjbc;
	1039	+// //75gODTT
	1040	+// private String s75gdgtt;
	1041	+// //甲状腺功能
	1042	+// private String jzxgn;
	1043	+ setZyqbdjc(antExChuModel.getZyqbd());
	1044	+ setNtjc(antExChuModel.getNtjc());
	1045	+ setCjsc(antExChuModel.getCjsc());
	1046	+ setTextpjbc(antExChuModel.getTextpjbc());
	1047	+ setS75gdgtt(antExChuModel.getS75gdgtt());
	1048	+ setJzxgn(antExChuModel.getJzxgn());
971	1049	try {
972	1050	setPastHistory(JsonUtil.jkstr2Obj(antExChuModel.getPastHistory(), Map.class));
973	1051	} catch (Exception e) {