liquanyu / regional-platform

Commit f6bbc5783925cb6b7bb4976a89ce7b26dc605429

Authored by yangfei about 8 years ago

自动生成追访信息

Showing 7 changed files with 1064 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java

...	...	@@ -263,6 +263,241 @@
263	263	//浮肿
264	264	private String edema;
265	265
	266	+ /*新增辅助检查项*/
	267	+ /*甲状腺功能*/
	268	+ //总三碘甲状腺原氨酸（TT3）
	269	+ public String ttita;
	270	+ //总甲状腺素(TT4)
	271	+ public String totalThy;
	272	+ //游离三碘甲状腺原氨酸（FT3）
	273	+ public String ftita;
	274	+ //游离甲状腺素（FT4）
	275	+ public String freeThy;
	276	+ //促甲状腺激素(TSH)
	277	+ public String thyStim;
	278	+ //抗甲状腺球蛋白抗体（TGA）
	279	+ public String antGlan;
	280	+ //抗甲状腺微粒体抗体(TMA)
	281	+ public String tmab;
	282	+ //甲状腺过氧化物酶抗体（TPOA）
	283	+ public String thyPerAnt;
	284	+ /*凝血功能*/
	285	+ //凝血酶原时间（PT-S）
	286	+ public String prothTime;
	287	+ //国际标准化比值（INR）
	288	+ public String interStan;
	289	+ //凝血酶原活动度（PT%）
	290	+ public String pta;
	291	+ //活化部分凝血活酶时间（APTT）
	292	+ public String actPar;
	293	+ //凝血酶时间（TT）
	294	+ public String thrTime;
	295	+ //纤维蛋白原（FIB）
	296	+ public String fibrin;
	297	+ //抗凝血酶III活性（AT-III）
	298	+ public String antil;
	299	+ //D-二聚体（D-Dimer）
	300	+ public String dimer;
	301	+ /*血脂*/
	302	+ //总胆固醇（TC）
	303	+ public String totalChol;
	304	+ //甘油三酯（TG）
	305	+ public String tricer;
	306	+ //高密度脂蛋白胆固醇（HDL-C）
	307	+ public String highDens;
	308	+ //低密度脂蛋白胆固醇（LDL-C）
	309	+ public String lowDens;
	310	+ //载脂蛋白A1（ApoA1）
	311	+ public String apolipa;
	312	+ //载脂蛋白B（ApoB）
	313	+ public String apolipb;
	314	+ //心电图
	315	+ public String electr;
	316	+
	317	+ public String getTtita() {
	318	+ return ttita;
	319	+ }
	320	+
	321	+ public void setTtita(String ttita) {
	322	+ this.ttita = ttita;
	323	+ }
	324	+
	325	+ public String getTotalThy() {
	326	+ return totalThy;
	327	+ }
	328	+
	329	+ public void setTotalThy(String totalThy) {
	330	+ this.totalThy = totalThy;
	331	+ }
	332	+
	333	+ public String getFtita() {
	334	+ return ftita;
	335	+ }
	336	+
	337	+ public void setFtita(String ftita) {
	338	+ this.ftita = ftita;
	339	+ }
	340	+
	341	+ public String getFreeThy() {
	342	+ return freeThy;
	343	+ }
	344	+
	345	+ public void setFreeThy(String freeThy) {
	346	+ this.freeThy = freeThy;
	347	+ }
	348	+
	349	+ public String getThyStim() {
	350	+ return thyStim;
	351	+ }
	352	+
	353	+ public void setThyStim(String thyStim) {
	354	+ this.thyStim = thyStim;
	355	+ }
	356	+
	357	+ public String getAntGlan() {
	358	+ return antGlan;
	359	+ }
	360	+
	361	+ public void setAntGlan(String antGlan) {
	362	+ this.antGlan = antGlan;
	363	+ }
	364	+
	365	+ public String getTmab() {
	366	+ return tmab;
	367	+ }
	368	+
	369	+ public void setTmab(String tmab) {
	370	+ this.tmab = tmab;
	371	+ }
	372	+
	373	+ public String getThyPerAnt() {
	374	+ return thyPerAnt;
	375	+ }
	376	+
	377	+ public void setThyPerAnt(String thyPerAnt) {
	378	+ this.thyPerAnt = thyPerAnt;
	379	+ }
	380	+
	381	+ public String getProthTime() {
	382	+ return prothTime;
	383	+ }
	384	+
	385	+ public void setProthTime(String prothTime) {
	386	+ this.prothTime = prothTime;
	387	+ }
	388	+
	389	+ public String getInterStan() {
	390	+ return interStan;
	391	+ }
	392	+
	393	+ public void setInterStan(String interStan) {
	394	+ this.interStan = interStan;
	395	+ }
	396	+
	397	+ public String getPta() {
	398	+ return pta;
	399	+ }
	400	+
	401	+ public void setPta(String pta) {
	402	+ this.pta = pta;
	403	+ }
	404	+
	405	+ public String getActPar() {
	406	+ return actPar;
	407	+ }
	408	+
	409	+ public void setActPar(String actPar) {
	410	+ this.actPar = actPar;
	411	+ }
	412	+
	413	+ public String getThrTime() {
	414	+ return thrTime;
	415	+ }
	416	+
	417	+ public void setThrTime(String thrTime) {
	418	+ this.thrTime = thrTime;
	419	+ }
	420	+
	421	+ public String getFibrin() {
	422	+ return fibrin;
	423	+ }
	424	+
	425	+ public void setFibrin(String fibrin) {
	426	+ this.fibrin = fibrin;
	427	+ }
	428	+
	429	+ public String getAntil() {
	430	+ return antil;
	431	+ }
	432	+
	433	+ public void setAntil(String antil) {
	434	+ this.antil = antil;
	435	+ }
	436	+
	437	+ public String getDimer() {
	438	+ return dimer;
	439	+ }
	440	+
	441	+ public void setDimer(String dimer) {
	442	+ this.dimer = dimer;
	443	+ }
	444	+
	445	+ public String getTotalChol() {
	446	+ return totalChol;
	447	+ }
	448	+
	449	+ public void setTotalChol(String totalChol) {
	450	+ this.totalChol = totalChol;
	451	+ }
	452	+
	453	+ public String getTricer() {
	454	+ return tricer;
	455	+ }
	456	+
	457	+ public void setTricer(String tricer) {
	458	+ this.tricer = tricer;
	459	+ }
	460	+
	461	+ public String getHighDens() {
	462	+ return highDens;
	463	+ }
	464	+
	465	+ public void setHighDens(String highDens) {
	466	+ this.highDens = highDens;
	467	+ }
	468	+
	469	+ public String getLowDens() {
	470	+ return lowDens;
	471	+ }
	472	+
	473	+ public void setLowDens(String lowDens) {
	474	+ this.lowDens = lowDens;
	475	+ }
	476	+
	477	+ public String getApolipa() {
	478	+ return apolipa;
	479	+ }
	480	+
	481	+ public void setApolipa(String apolipa) {
	482	+ this.apolipa = apolipa;
	483	+ }
	484	+
	485	+ public String getApolipb() {
	486	+ return apolipb;
	487	+ }
	488	+
	489	+ public void setApolipb(String apolipb) {
	490	+ this.apolipb = apolipb;
	491	+ }
	492	+
	493	+ public String getElectr() {
	494	+ return electr;
	495	+ }
	496	+
	497	+ public void setElectr(String electr) {
	498	+ this.electr = electr;
	499	+ }
	500	+
266	501	public String getEdema() {
267	502	return edema;
268	503	}

...	...	@@ -224,6 +224,246 @@
224	224	//甲状腺功能
225	225	private String jzxgn;
226	226
	227	+ /*新增辅助检查项*/
	228	+ /*甲状腺功能*/
	229	+ //总三碘甲状腺原氨酸（TT3）
	230	+ public String ttita;
	231	+ //总甲状腺素(TT4)
	232	+ public String totalThy;
	233	+ //游离三碘甲状腺原氨酸（FT3）
	234	+ public String ftita;
	235	+ //游离甲状腺素（FT4）
	236	+ public String freeThy;
	237	+ //促甲状腺激素(TSH)
	238	+ public String thyStim;
	239	+ //抗甲状腺球蛋白抗体（TGA）
	240	+ public String antGlan;
	241	+ //抗甲状腺微粒体抗体(TMA)
	242	+ public String tmab;
	243	+ //甲状腺过氧化物酶抗体（TPOA）
	244	+ public String thyPerAnt;
	245	+ /*凝血功能*/
	246	+ //凝血酶原时间（PT-S）
	247	+ public String prothTime;
	248	+ //国际标准化比值（INR）
	249	+ public String interStan;
	250	+ //凝血酶原活动度（PT%）
	251	+ public String pta;
	252	+ //活化部分凝血活酶时间（APTT）
	253	+ public String actPar;
	254	+ //凝血酶时间（TT）
	255	+ public String thrTime;
	256	+ //纤维蛋白原（FIB）
	257	+ public String fibrin;
	258	+ //抗凝血酶III活性（AT-III）
	259	+ public String antil;
	260	+ //D-二聚体（D-Dimer）
	261	+ public String dimer;
	262	+ /*血脂*/
	263	+ //总胆固醇（TC）
	264	+ public String totalChol;
	265	+ //甘油三酯（TG）
	266	+ public String tricer;
	267	+ //高密度脂蛋白胆固醇（HDL-C）
	268	+ public String highDens;
	269	+ //低密度脂蛋白胆固醇（LDL-C）
	270	+ public String lowDens;
	271	+ //载脂蛋白A1（ApoA1）
	272	+ public String apolipa;
	273	+ //载脂蛋白B（ApoB）
	274	+ public String apolipb;
	275	+ //心电图
	276	+ public String electr;
	277	+
	278	+
	279	+ public String getTtita() {
	280	+ return ttita;
	281	+ }
	282	+
	283	+ public void setTtita(String ttita) {
	284	+ this.ttita = ttita;
	285	+ }
	286	+
	287	+ public String getTotalThy() {
	288	+ return totalThy;
	289	+ }
	290	+
	291	+ public void setTotalThy(String totalThy) {
	292	+ this.totalThy = totalThy;
	293	+ }
	294	+
	295	+ public String getFtita() {
	296	+ return ftita;
	297	+ }
	298	+
	299	+ public void setFtita(String ftita) {
	300	+ this.ftita = ftita;
	301	+ }
	302	+
	303	+ public String getFreeThy() {
	304	+ return freeThy;
	305	+ }
	306	+
	307	+ public void setFreeThy(String freeThy) {
	308	+ this.freeThy = freeThy;
	309	+ }
	310	+
	311	+ public String getThyStim() {
	312	+ return thyStim;
	313	+ }
	314	+
	315	+ public void setThyStim(String thyStim) {
	316	+ this.thyStim = thyStim;
	317	+ }
	318	+
	319	+ public String getAntGlan() {
	320	+ return antGlan;
	321	+ }
	322	+
	323	+ public void setAntGlan(String antGlan) {
	324	+ this.antGlan = antGlan;
	325	+ }
	326	+
	327	+ public String getTmab() {
	328	+ return tmab;
	329	+ }
	330	+
	331	+ public void setTmab(String tmab) {
	332	+ this.tmab = tmab;
	333	+ }
	334	+
	335	+ public String getThyPerAnt() {
	336	+ return thyPerAnt;
	337	+ }
	338	+
	339	+ public void setThyPerAnt(String thyPerAnt) {
	340	+ this.thyPerAnt = thyPerAnt;
	341	+ }
	342	+
	343	+ public String getProthTime() {
	344	+ return prothTime;
	345	+ }
	346	+
	347	+ public void setProthTime(String prothTime) {
	348	+ this.prothTime = prothTime;
	349	+ }
	350	+
	351	+ public String getInterStan() {
	352	+ return interStan;
	353	+ }
	354	+
	355	+ public void setInterStan(String interStan) {
	356	+ this.interStan = interStan;
	357	+ }
	358	+
	359	+ public String getPta() {
	360	+ return pta;
	361	+ }
	362	+
	363	+ public void setPta(String pta) {
	364	+ this.pta = pta;
	365	+ }
	366	+
	367	+ public String getActPar() {
	368	+ return actPar;
	369	+ }
	370	+
	371	+ public void setActPar(String actPar) {
	372	+ this.actPar = actPar;
	373	+ }
	374	+
	375	+ public String getThrTime() {
	376	+ return thrTime;
	377	+ }
	378	+
	379	+ public void setThrTime(String thrTime) {
	380	+ this.thrTime = thrTime;
	381	+ }
	382	+
	383	+ public String getFibrin() {
	384	+ return fibrin;
	385	+ }
	386	+
	387	+ public void setFibrin(String fibrin) {
	388	+ this.fibrin = fibrin;
	389	+ }
	390	+
	391	+ public String getAntil() {
	392	+ return antil;
	393	+ }
	394	+
	395	+ public void setAntil(String antil) {
	396	+ this.antil = antil;
	397	+ }
	398	+
	399	+ public String getDimer() {
	400	+ return dimer;
	401	+ }
	402	+
	403	+ public void setDimer(String dimer) {
	404	+ this.dimer = dimer;
	405	+ }
	406	+
	407	+ public String getTotalChol() {
	408	+ return totalChol;
	409	+ }
	410	+
	411	+ public void setTotalChol(String totalChol) {
	412	+ this.totalChol = totalChol;
	413	+ }
	414	+
	415	+ public String getTricer() {
	416	+ return tricer;
	417	+ }
	418	+
	419	+ public void setTricer(String tricer) {
	420	+ this.tricer = tricer;
	421	+ }
	422	+
	423	+ public String getHighDens() {
	424	+ return highDens;
	425	+ }
	426	+
	427	+ public void setHighDens(String highDens) {
	428	+ this.highDens = highDens;
	429	+ }
	430	+
	431	+ public String getLowDens() {
	432	+ return lowDens;
	433	+ }
	434	+
	435	+ public void setLowDens(String lowDens) {
	436	+ this.lowDens = lowDens;
	437	+ }
	438	+
	439	+ public String getApolipa() {
	440	+ return apolipa;
	441	+ }
	442	+
	443	+ public void setApolipa(String apolipa) {
	444	+ this.apolipa = apolipa;
	445	+ }
	446	+
	447	+ public String getApolipb() {
	448	+ return apolipb;
	449	+ }
	450	+
	451	+ public void setApolipb(String apolipb) {
	452	+ this.apolipb = apolipb;
	453	+ }
	454	+
	455	+ public String getElectr() {
	456	+ return electr;
	457	+ }
	458	+
	459	+ public void setElectr(String electr) {
	460	+ this.electr = electr;
	461	+ }
	462	+
	463	+ /*新增辅助检查项*/
	464	+
	465	+
	466	+
227	467	public String getHighriskDesc() {
228	468	return highriskDesc;
229	469	}

...	...	@@ -1155,6 +1155,7 @@
1155	1155	model.setXldq(checkModel.getXldq());
1156	1156	model.setNd(checkModel.getNd());
1157	1157	model.setYgbmky(checkModel.getYgbmky());
	1158	+ model.setYgbmkt(checkModel.getYgbmkt());
1158	1159	model.setYgeky(checkModel.getYgeky());
1159	1160	model.setYgekt(checkModel.getYgekt());
1160	1161	model.setYghxkt(checkModel.getYghxkt());

...	...	@@ -177,7 +177,6 @@
177	177
178	178	private Integer couponType;
179	179
180		-
181	180	//早孕期病毒检测
182	181	private String zyqbdjc;
183	182	//nt检查
...	...	@@ -191,6 +190,245 @@
191	190	//甲状腺功能
192	191	private String jzxgn;
193	192
	193	+ /*新增辅助检查项*/
	194	+ /*甲状腺功能*/
	195	+ //总三碘甲状腺原氨酸（TT3）
	196	+ public String ttita;
	197	+ //总甲状腺素(TT4)
	198	+ public String totalThy;
	199	+ //游离三碘甲状腺原氨酸（FT3）
	200	+ public String ftita;
	201	+ //游离甲状腺素（FT4）
	202	+ public String freeThy;
	203	+ //促甲状腺激素(TSH)
	204	+ public String thyStim;
	205	+ //抗甲状腺球蛋白抗体（TGA）
	206	+ public String antGlan;
	207	+ //抗甲状腺微粒体抗体(TMA)
	208	+ public String tmab;
	209	+ //甲状腺过氧化物酶抗体（TPOA）
	210	+ public String thyPerAnt;
	211	+ /*凝血功能*/
	212	+ //凝血酶原时间（PT-S）
	213	+ public String prothTime;
	214	+ //国际标准化比值（INR）
	215	+ public String interStan;
	216	+ //凝血酶原活动度（PT%）
	217	+ public String pta;
	218	+ //活化部分凝血活酶时间（APTT）
	219	+ public String actPar;
	220	+ //凝血酶时间（TT）
	221	+ public String thrTime;
	222	+ //纤维蛋白原（FIB）
	223	+ public String fibrin;
	224	+ //抗凝血酶III活性（AT-III）
	225	+ public String antil;
	226	+ //D-二聚体（D-Dimer）
	227	+ public String dimer;
	228	+ /*血脂*/
	229	+ //总胆固醇（TC）
	230	+ public String totalChol;
	231	+ //甘油三酯（TG）
	232	+ public String tricer;
	233	+ //高密度脂蛋白胆固醇（HDL-C）
	234	+ public String highDens;
	235	+ //低密度脂蛋白胆固醇（LDL-C）
	236	+ public String lowDens;
	237	+ //载脂蛋白A1（ApoA1）
	238	+ public String apolipa;
	239	+ //载脂蛋白B（ApoB）
	240	+ public String apolipb;
	241	+ //心电图
	242	+ public String electr;
	243	+
	244	+
	245	+ public String getTtita() {
	246	+ return ttita;
	247	+ }
	248	+
	249	+ public void setTtita(String ttita) {
	250	+ this.ttita = ttita;
	251	+ }
	252	+
	253	+ public String getTotalThy() {
	254	+ return totalThy;
	255	+ }
	256	+
	257	+ public void setTotalThy(String totalThy) {
	258	+ this.totalThy = totalThy;
	259	+ }
	260	+
	261	+ public String getFtita() {
	262	+ return ftita;
	263	+ }
	264	+
	265	+ public void setFtita(String ftita) {
	266	+ this.ftita = ftita;
	267	+ }
	268	+
	269	+ public String getFreeThy() {
	270	+ return freeThy;
	271	+ }
	272	+
	273	+ public void setFreeThy(String freeThy) {
	274	+ this.freeThy = freeThy;
	275	+ }
	276	+
	277	+ public String getThyStim() {
	278	+ return thyStim;
	279	+ }
	280	+
	281	+ public void setThyStim(String thyStim) {
	282	+ this.thyStim = thyStim;
	283	+ }
	284	+
	285	+ public String getAntGlan() {
	286	+ return antGlan;
	287	+ }
	288	+
	289	+ public void setAntGlan(String antGlan) {
	290	+ this.antGlan = antGlan;
	291	+ }
	292	+
	293	+ public String getTmab() {
	294	+ return tmab;
	295	+ }
	296	+
	297	+ public void setTmab(String tmab) {
	298	+ this.tmab = tmab;
	299	+ }
	300	+
	301	+ public String getThyPerAnt() {
	302	+ return thyPerAnt;
	303	+ }
	304	+
	305	+ public void setThyPerAnt(String thyPerAnt) {
	306	+ this.thyPerAnt = thyPerAnt;
	307	+ }
	308	+
	309	+ public String getProthTime() {
	310	+ return prothTime;
	311	+ }
	312	+
	313	+ public void setProthTime(String prothTime) {
	314	+ this.prothTime = prothTime;
	315	+ }
	316	+
	317	+ public String getInterStan() {
	318	+ return interStan;
	319	+ }
	320	+
	321	+ public void setInterStan(String interStan) {
	322	+ this.interStan = interStan;
	323	+ }
	324	+
	325	+ public String getPta() {
	326	+ return pta;
	327	+ }
	328	+
	329	+ public void setPta(String pta) {
	330	+ this.pta = pta;
	331	+ }
	332	+
	333	+ public String getActPar() {
	334	+ return actPar;
	335	+ }
	336	+
	337	+ public void setActPar(String actPar) {
	338	+ this.actPar = actPar;
	339	+ }
	340	+
	341	+ public String getThrTime() {
	342	+ return thrTime;
	343	+ }
	344	+
	345	+ public void setThrTime(String thrTime) {
	346	+ this.thrTime = thrTime;
	347	+ }
	348	+
	349	+ public String getFibrin() {
	350	+ return fibrin;
	351	+ }
	352	+
	353	+ public void setFibrin(String fibrin) {
	354	+ this.fibrin = fibrin;
	355	+ }
	356	+
	357	+ public String getAntil() {
	358	+ return antil;
	359	+ }
	360	+
	361	+ public void setAntil(String antil) {
	362	+ this.antil = antil;
	363	+ }
	364	+
	365	+ public String getDimer() {
	366	+ return dimer;
	367	+ }
	368	+
	369	+ public void setDimer(String dimer) {
	370	+ this.dimer = dimer;
	371	+ }
	372	+
	373	+ public String getTotalChol() {
	374	+ return totalChol;
	375	+ }
	376	+
	377	+ public void setTotalChol(String totalChol) {
	378	+ this.totalChol = totalChol;
	379	+ }
	380	+
	381	+ public String getTricer() {
	382	+ return tricer;
	383	+ }
	384	+
	385	+ public void setTricer(String tricer) {
	386	+ this.tricer = tricer;
	387	+ }
	388	+
	389	+ public String getHighDens() {
	390	+ return highDens;
	391	+ }
	392	+
	393	+ public void setHighDens(String highDens) {
	394	+ this.highDens = highDens;
	395	+ }
	396	+
	397	+ public String getLowDens() {
	398	+ return lowDens;
	399	+ }
	400	+
	401	+ public void setLowDens(String lowDens) {
	402	+ this.lowDens = lowDens;
	403	+ }
	404	+
	405	+ public String getApolipa() {
	406	+ return apolipa;
	407	+ }
	408	+
	409	+ public void setApolipa(String apolipa) {
	410	+ this.apolipa = apolipa;
	411	+ }
	412	+
	413	+ public String getApolipb() {
	414	+ return apolipb;
	415	+ }
	416	+
	417	+ public void setApolipb(String apolipb) {
	418	+ this.apolipb = apolipb;
	419	+ }
	420	+
	421	+ public String getElectr() {
	422	+ return electr;
	423	+ }
	424	+
	425	+ public void setElectr(String electr) {
	426	+ this.electr = electr;
	427	+ }
	428	+
	429	+ /*新增辅助检查项*/
	430	+
	431	+
194	432	public String getHighriskDesc() {
195	433	return highriskDesc;
196	434	}
...	...	@@ -352,6 +590,30 @@
352	590	@Override
353	591	public AntenatalExaminationModel convertToDataModel() {
354	592	AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
	593	+ examinationModel.setTtita(ttita);
	594	+ examinationModel.setTotalThy(totalThy);
	595	+ examinationModel.setFtita(ftita);
	596	+ examinationModel.setFreeThy(freeThy);
	597	+ examinationModel.setThyStim(thyStim);
	598	+ examinationModel.setAntGlan(antGlan);
	599	+ examinationModel.setTmab(tmab);
	600	+ examinationModel.setThyPerAnt(thyPerAnt);
	601	+ examinationModel.setProthTime(prothTime);
	602	+ examinationModel.setInterStan(interStan);
	603	+ examinationModel.setPta(pta);
	604	+ examinationModel.setActPar(actPar);
	605	+ examinationModel.setThrTime(thrTime);
	606	+ examinationModel.setFibrin(fibrin);
	607	+ examinationModel.setAntil(antil);
	608	+ examinationModel.setDimer(dimer);
	609	+ examinationModel.setTotalChol(totalChol);
	610	+ examinationModel.setTricer(tricer);
	611	+ examinationModel.setHighDens(highDens);
	612	+ examinationModel.setLowDens(lowDens);
	613	+ examinationModel.setApolipa(apolipa);
	614	+ examinationModel.setApolipb(apolipb);
	615	+ examinationModel.setElectr(electr);
	616	+
355	617	examinationModel.setHighriskDesc(highriskDesc);
356	618	examinationModel.setLisCheckItems(lisCheckItems);
357	619	examinationModel.setGenRemark(genRemark);

...	...	@@ -126,9 +126,13 @@
126	126
127	127	private Map<String, List<String>> treatmentOpinion2;
128	128	private List<String> treatmentOpinion2Types;
129		- /** 胎动 */
	129	+ /**
	130	+ * 胎动
	131	+ */
130	132	private String quicken;
131		- /** 胎动备注 */
	133	+ /**
	134	+ * 胎动备注
	135	+ */
132	136	private String quickenRemark;
133	137
134	138	public String getCweight() {
...	...	@@ -299,7 +303,7 @@
299	303	private String cDueWeek;
300	304
301	305	//初诊其他信息
302		- private List<AntExcAddOther> antExcAddOthers;
	306	+ private List<AntExcAddOther> antExcAddOthers;
303	307	//存活胎儿数
304	308	private Integer survFetus;
305	309
...	...	@@ -385,7 +389,57 @@
385	389	//甲状腺功能
386	390	private String jzxgn;
387	391
388		-
	392	+ /*新增辅助检查项*/
	393	+ /*甲状腺功能*/
	394	+ //总三碘甲状腺原氨酸（TT3）
	395	+ public String ttita;
	396	+ //总甲状腺素(TT4)
	397	+ public String totalThy;
	398	+ //游离三碘甲状腺原氨酸（FT3）
	399	+ public String ftita;
	400	+ //游离甲状腺素（FT4）
	401	+ public String freeThy;
	402	+ //促甲状腺激素(TSH)
	403	+ public String thyStim;
	404	+ //抗甲状腺球蛋白抗体（TGA）
	405	+ public String antGlan;
	406	+ //抗甲状腺微粒体抗体(TMA)
	407	+ public String tmab;
	408	+ //甲状腺过氧化物酶抗体（TPOA）
	409	+ public String thyPerAnt;
	410	+ /*凝血功能*/
	411	+ //凝血酶原时间（PT-S）
	412	+ public String prothTime;
	413	+ //国际标准化比值（INR）
	414	+ public String interStan;
	415	+ //凝血酶原活动度（PT%）
	416	+ public String pta;
	417	+ //活化部分凝血活酶时间（APTT）
	418	+ public String actPar;
	419	+ //凝血酶时间（TT）
	420	+ public String thrTime;
	421	+ //纤维蛋白原（FIB）
	422	+ public String fibrin;
	423	+ //抗凝血酶III活性（AT-III）
	424	+ public String antil;
	425	+ //D-二聚体（D-Dimer）
	426	+ public String dimer;
	427	+ /*血脂*/
	428	+ //总胆固醇（TC）
	429	+ public String totalChol;
	430	+ //甘油三酯（TG）
	431	+ public String tricer;
	432	+ //高密度脂蛋白胆固醇（HDL-C）
	433	+ public String highDens;
	434	+ //低密度脂蛋白胆固醇（LDL-C）
	435	+ public String lowDens;
	436	+ //载脂蛋白A1（ApoA1）
	437	+ public String apolipa;
	438	+ //载脂蛋白B（ApoB）
	439	+ public String apolipb;
	440	+ //心电图
	441	+ public String electr;
	442	+ /*新增辅助检查项*/
389	443	/**
390	444	* 辅助检查中
391	445	*/
...	...	@@ -401,6 +455,190 @@
401	455	//浮肿
402	456	private String edema;
403	457
	458	+ public String getTtita() {
	459	+ return ttita;
	460	+ }
	461	+
	462	+ public void setTtita(String ttita) {
	463	+ this.ttita = ttita;
	464	+ }
	465	+
	466	+ public String getTotalThy() {
	467	+ return totalThy;
	468	+ }
	469	+
	470	+ public void setTotalThy(String totalThy) {
	471	+ this.totalThy = totalThy;
	472	+ }
	473	+
	474	+ public String getFtita() {
	475	+ return ftita;
	476	+ }
	477	+
	478	+ public void setFtita(String ftita) {
	479	+ this.ftita = ftita;
	480	+ }
	481	+
	482	+ public String getFreeThy() {
	483	+ return freeThy;
	484	+ }
	485	+
	486	+ public void setFreeThy(String freeThy) {
	487	+ this.freeThy = freeThy;
	488	+ }
	489	+
	490	+ public String getThyStim() {
	491	+ return thyStim;
	492	+ }
	493	+
	494	+ public void setThyStim(String thyStim) {
	495	+ this.thyStim = thyStim;
	496	+ }
	497	+
	498	+ public String getAntGlan() {
	499	+ return antGlan;
	500	+ }
	501	+
	502	+ public void setAntGlan(String antGlan) {
	503	+ this.antGlan = antGlan;
	504	+ }
	505	+
	506	+ public String getTmab() {
	507	+ return tmab;
	508	+ }
	509	+
	510	+ public void setTmab(String tmab) {
	511	+ this.tmab = tmab;
	512	+ }
	513	+
	514	+ public String getThyPerAnt() {
	515	+ return thyPerAnt;
	516	+ }
	517	+
	518	+ public void setThyPerAnt(String thyPerAnt) {
	519	+ this.thyPerAnt = thyPerAnt;
	520	+ }
	521	+
	522	+ public String getProthTime() {
	523	+ return prothTime;
	524	+ }
	525	+
	526	+ public void setProthTime(String prothTime) {
	527	+ this.prothTime = prothTime;
	528	+ }
	529	+
	530	+ public String getInterStan() {
	531	+ return interStan;
	532	+ }
	533	+
	534	+ public void setInterStan(String interStan) {
	535	+ this.interStan = interStan;
	536	+ }
	537	+
	538	+ public String getPta() {
	539	+ return pta;
	540	+ }
	541	+
	542	+ public void setPta(String pta) {
	543	+ this.pta = pta;
	544	+ }
	545	+
	546	+ public String getActPar() {
	547	+ return actPar;
	548	+ }
	549	+
	550	+ public void setActPar(String actPar) {
	551	+ this.actPar = actPar;
	552	+ }
	553	+
	554	+ public String getThrTime() {
	555	+ return thrTime;
	556	+ }
	557	+
	558	+ public void setThrTime(String thrTime) {
	559	+ this.thrTime = thrTime;
	560	+ }
	561	+
	562	+ public String getFibrin() {
	563	+ return fibrin;
	564	+ }
	565	+
	566	+ public void setFibrin(String fibrin) {
	567	+ this.fibrin = fibrin;
	568	+ }
	569	+
	570	+ public String getAntil() {
	571	+ return antil;
	572	+ }
	573	+
	574	+ public void setAntil(String antil) {
	575	+ this.antil = antil;
	576	+ }
	577	+
	578	+ public String getDimer() {
	579	+ return dimer;
	580	+ }
	581	+
	582	+ public void setDimer(String dimer) {
	583	+ this.dimer = dimer;
	584	+ }
	585	+
	586	+ public String getTotalChol() {
	587	+ return totalChol;
	588	+ }
	589	+
	590	+ public void setTotalChol(String totalChol) {
	591	+ this.totalChol = totalChol;
	592	+ }
	593	+
	594	+ public String getTricer() {
	595	+ return tricer;
	596	+ }
	597	+
	598	+ public void setTricer(String tricer) {
	599	+ this.tricer = tricer;
	600	+ }
	601	+
	602	+ public String getHighDens() {
	603	+ return highDens;
	604	+ }
	605	+
	606	+ public void setHighDens(String highDens) {
	607	+ this.highDens = highDens;
	608	+ }
	609	+
	610	+ public String getLowDens() {
	611	+ return lowDens;
	612	+ }
	613	+
	614	+ public void setLowDens(String lowDens) {
	615	+ this.lowDens = lowDens;
	616	+ }
	617	+
	618	+ public String getApolipa() {
	619	+ return apolipa;
	620	+ }
	621	+
	622	+ public void setApolipa(String apolipa) {
	623	+ this.apolipa = apolipa;
	624	+ }
	625	+
	626	+ public String getApolipb() {
	627	+ return apolipb;
	628	+ }
	629	+
	630	+ public void setApolipb(String apolipb) {
	631	+ this.apolipb = apolipb;
	632	+ }
	633	+
	634	+ public String getElectr() {
	635	+ return electr;
	636	+ }
	637	+
	638	+ public void setElectr(String electr) {
	639	+ this.electr = electr;
	640	+ }
	641	+
404	642	public String getHighriskDesc() {
405	643	return highriskDesc;
406	644	}
...	...	@@ -1347,6 +1585,32 @@
1347	1585	@Override
1348	1586	public AntExChuModel convertToDataModel() {
1349	1587	AntExChuModel antExChuModel = new AntExChuModel();
	1588	+ antExChuModel.setTtita(ttita);
	1589	+ antExChuModel.setTotalThy(totalThy);
	1590	+ antExChuModel.setFtita(ftita);
	1591	+ antExChuModel.setFreeThy(freeThy);
	1592	+ antExChuModel.setThyStim(thyStim);
	1593	+ antExChuModel.setAntGlan(antGlan);
	1594	+ antExChuModel.setTmab(tmab);
	1595	+ antExChuModel.setThyPerAnt(thyPerAnt);
	1596	+ antExChuModel.setProthTime(prothTime);
	1597	+ antExChuModel.setInterStan(interStan);
	1598	+ antExChuModel.setPta(pta);
	1599	+ antExChuModel.setActPar(actPar);
	1600	+ antExChuModel.setThrTime(thrTime);
	1601	+ antExChuModel.setFibrin(fibrin);
	1602	+ antExChuModel.setAntil(antil);
	1603	+ antExChuModel.setDimer(dimer);
	1604	+ antExChuModel.setTotalChol(totalChol);
	1605	+ antExChuModel.setTricer(tricer);
	1606	+ antExChuModel.setHighDens(highDens);
	1607	+ antExChuModel.setLowDens(lowDens);
	1608	+ antExChuModel.setApolipa(apolipa);
	1609	+ antExChuModel.setApolipb(apolipb);
	1610	+ antExChuModel.setElectr(electr);
	1611	+
	1612	+
	1613	+
1350	1614	antExChuModel.setHighriskDesc(highriskDesc);
1351	1615	antExChuModel.setLisCheckItems(lisCheckItems);
1352	1616	antExChuModel.setGenRemark(genRemark);
...	...	@@ -1472,7 +1736,7 @@
1472	1736	}
1473	1737	antExChuModel.setHighriskSocre(highriskSocre);
1474	1738
1475		- if(CollectionUtils.isNotEmpty(otherHighRisk)){
	1739	+ if (CollectionUtils.isNotEmpty(otherHighRisk)) {
1476	1740	antExChuModel.setOtherHighRisk(JsonUtil.array2JsonString(otherHighRisk));
1477	1741	}
1478	1742	if (null != diagnosis) {

...	...	@@ -170,7 +170,6 @@
170	170	private String platelet;
171	171	//血常规其他
172	172	private String otherBlood;
173		-
174	173	//尿常规：尿蛋白
175	174	private String urineProtein;
176	175	//尿常规：尿糖

...	...	@@ -625,6 +625,61 @@
625	625	//病历号(住院号)
626	626	private String blNo;
627	627
	628	+ /*畸形详情**/
	629	+ //无脑畸形
	630	+ public Integer jxWn;
	631	+ //脊柱裂
	632	+ public Integer jxJzl;
	633	+ //脑彭出
	634	+ public Integer jxNpc;
	635	+ //先天性脑积水
	636	+ public Integer jxNjs;
	637	+ //腭裂
	638	+ public String jxEl;
	639	+ //唇裂
	640	+ public String jxCl;
	641	+ //唇裂合并腭裂
	642	+ public String jxClhb;
	643	+ //小耳(包括无耳)
	644	+ public String jxXe;
	645	+ //外耳其他畸形(小耳、无耳除外)
	646	+ public String jxWe;
	647	+ //食道闭锁或狭窄
	648	+ public Integer jxSdbs;
	649	+ //直肠肛门闭锁或狭窄(包括无肛)
	650	+ public Integer jxZcgm;
	651	+ //尿道下裂
	652	+ public Integer jxNdxl;
	653	+ //膀胱外翻
	654	+ public Integer jxPwwf;
	655	+ //马蹄内翻足
	656	+ public String jxMtn;
	657	+ //多指
	658	+ public String jxDz;
	659	+ //多趾
	660	+ public String jxDc;
	661	+ //并指
	662	+ public String jxBz;
	663	+ //并趾
	664	+ public String jxBc;
	665	+ //肢体短缩包括缺指(趾)、裂手(足)]
	666	+ public String jxZtds;
	667	+ //先天性隔疝
	668	+ public Integer jxXtxe;
	669	+ //脐膨出
	670	+ public Integer jxQpc;
	671	+ //腹裂
	672	+ public Integer jxFl;
	673	+ //联体双胎
	674	+ public Integer jxLtst;
	675	+ //唐氏综合征(21-三体综合征)
	676	+ public Integer jxTszh;
	677	+ //先天性心脏病
	678	+ public Integer jxXtx;
	679	+ //其他(写明病名并详细描述)
	680	+ public Integer jxOther;
	681	+ /*畸形详情结束**/
	682	+
628	683	@Override
629	684	public MaternalDeliverModel.Baby convertToDataModel() {
630	685	MaternalDeliverModel.Baby baby= new MaternalDeliverModel.Baby();
...	...	@@ -647,6 +702,7 @@
647	702	baby.setDueTime(dueTime);
648	703	return baby;
649	704	}
	705	+
650	706
651	707	public String getBabyDiagnosis() {
652	708	return babyDiagnosis;