jiangjiazhi / regional-platform

Commit c7d922ef76bf16ac09e67c824a372515b58447f2

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

初诊、复诊增加辅助检查项

Showing 4 changed files with 527 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.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/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -235,7 +235,7 @@
235	235	//游离甲状腺素（FT4）
236	236	public String freeThy;
237	237	//促甲状腺激素(TSH)
238		- public String thyStim;
	238	+ public Map<String,Object> thyStim;
239	239	//抗甲状腺球蛋白抗体（TGA）
240	240	public String antGlan;
241	241	//抗甲状腺微粒体抗体(TMA)
242	242
...	...	@@ -308,11 +308,11 @@
308	308	this.freeThy = freeThy;
309	309	}
310	310
311		- public String getThyStim() {
	311	+ public Map<String, Object> getThyStim() {
312	312	return thyStim;
313	313	}
314	314
315		- public void setThyStim(String thyStim) {
	315	+ public void setThyStim(Map<String, Object> thyStim) {
316	316	this.thyStim = thyStim;
317	317	}
318	318

...	...	@@ -201,7 +201,7 @@
201	201	//游离甲状腺素（FT4）
202	202	public String freeThy;
203	203	//促甲状腺激素(TSH)
204		- public String thyStim;
	204	+ public Map<String,Object> thyStim;
205	205	//抗甲状腺球蛋白抗体（TGA）
206	206	public String antGlan;
207	207	//抗甲状腺微粒体抗体(TMA)
208	208
...	...	@@ -274,11 +274,11 @@
274	274	this.freeThy = freeThy;
275	275	}
276	276
277		- public String getThyStim() {
	277	+ public Map<String, Object> getThyStim() {
278	278	return thyStim;
279	279	}
280	280
281		- public void setThyStim(String thyStim) {
	281	+ public void setThyStim(Map<String, Object> thyStim) {
282	282	this.thyStim = thyStim;
283	283	}
284	284

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

...	...	@@ -391,6 +391,241 @@
391	391	//浮肿
392	392	private String edema;
393	393
	394	+ /*新增辅助检查项*/
	395	+ /*甲状腺功能*/
	396	+ //总三碘甲状腺原氨酸（TT3）
	397	+ public String ttita;
	398	+ //总甲状腺素(TT4)
	399	+ public String totalThy;
	400	+ //游离三碘甲状腺原氨酸（FT3）
	401	+ public String ftita;
	402	+ //游离甲状腺素（FT4）
	403	+ public String freeThy;
	404	+ //促甲状腺激素(TSH)
	405	+ public Map thyStim;
	406	+ //抗甲状腺球蛋白抗体（TGA）
	407	+ public String antGlan;
	408	+ //抗甲状腺微粒体抗体(TMA)
	409	+ public String tmab;
	410	+ //甲状腺过氧化物酶抗体（TPOA）
	411	+ public String thyPerAnt;
	412	+ /*凝血功能*/
	413	+ //凝血酶原时间（PT-S）
	414	+ public String prothTime;
	415	+ //国际标准化比值（INR）
	416	+ public String interStan;
	417	+ //凝血酶原活动度（PT%）
	418	+ public String pta;
	419	+ //活化部分凝血活酶时间（APTT）
	420	+ public String actPar;
	421	+ //凝血酶时间（TT）
	422	+ public String thrTime;
	423	+ //纤维蛋白原（FIB）
	424	+ public String fibrin;
	425	+ //抗凝血酶III活性（AT-III）
	426	+ public String antil;
	427	+ //D-二聚体（D-Dimer）
	428	+ public String dimer;
	429	+ /*血脂*/
	430	+ //总胆固醇（TC）
	431	+ public String totalChol;
	432	+ //甘油三酯（TG）
	433	+ public String tricer;
	434	+ //高密度脂蛋白胆固醇（HDL-C）
	435	+ public String highDens;
	436	+ //低密度脂蛋白胆固醇（LDL-C）
	437	+ public String lowDens;
	438	+ //载脂蛋白A1（ApoA1）
	439	+ public String apolipa;
	440	+ //载脂蛋白B（ApoB）
	441	+ public String apolipb;
	442	+ //心电图
	443	+ public String electr;
	444	+
	445	+ public String getTtita() {
	446	+ return ttita;
	447	+ }
	448	+
	449	+ public void setTtita(String ttita) {
	450	+ this.ttita = ttita;
	451	+ }
	452	+
	453	+ public String getTotalThy() {
	454	+ return totalThy;
	455	+ }
	456	+
	457	+ public void setTotalThy(String totalThy) {
	458	+ this.totalThy = totalThy;
	459	+ }
	460	+
	461	+ public String getFtita() {
	462	+ return ftita;
	463	+ }
	464	+
	465	+ public void setFtita(String ftita) {
	466	+ this.ftita = ftita;
	467	+ }
	468	+
	469	+ public String getFreeThy() {
	470	+ return freeThy;
	471	+ }
	472	+
	473	+ public void setFreeThy(String freeThy) {
	474	+ this.freeThy = freeThy;
	475	+ }
	476	+
	477	+ public Map getThyStim() {
	478	+ return thyStim;
	479	+ }
	480	+
	481	+ public void setThyStim(Map thyStim) {
	482	+ this.thyStim = thyStim;
	483	+ }
	484	+
	485	+ public String getAntGlan() {
	486	+ return antGlan;
	487	+ }
	488	+
	489	+ public void setAntGlan(String antGlan) {
	490	+ this.antGlan = antGlan;
	491	+ }
	492	+
	493	+ public String getTmab() {
	494	+ return tmab;
	495	+ }
	496	+
	497	+ public void setTmab(String tmab) {
	498	+ this.tmab = tmab;
	499	+ }
	500	+
	501	+ public String getThyPerAnt() {
	502	+ return thyPerAnt;
	503	+ }
	504	+
	505	+ public void setThyPerAnt(String thyPerAnt) {
	506	+ this.thyPerAnt = thyPerAnt;
	507	+ }
	508	+
	509	+ public String getProthTime() {
	510	+ return prothTime;
	511	+ }
	512	+
	513	+ public void setProthTime(String prothTime) {
	514	+ this.prothTime = prothTime;
	515	+ }
	516	+
	517	+ public String getInterStan() {
	518	+ return interStan;
	519	+ }
	520	+
	521	+ public void setInterStan(String interStan) {
	522	+ this.interStan = interStan;
	523	+ }
	524	+
	525	+ public String getPta() {
	526	+ return pta;
	527	+ }
	528	+
	529	+ public void setPta(String pta) {
	530	+ this.pta = pta;
	531	+ }
	532	+
	533	+ public String getActPar() {
	534	+ return actPar;
	535	+ }
	536	+
	537	+ public void setActPar(String actPar) {
	538	+ this.actPar = actPar;
	539	+ }
	540	+
	541	+ public String getThrTime() {
	542	+ return thrTime;
	543	+ }
	544	+
	545	+ public void setThrTime(String thrTime) {
	546	+ this.thrTime = thrTime;
	547	+ }
	548	+
	549	+ public String getFibrin() {
	550	+ return fibrin;
	551	+ }
	552	+
	553	+ public void setFibrin(String fibrin) {
	554	+ this.fibrin = fibrin;
	555	+ }
	556	+
	557	+ public String getAntil() {
	558	+ return antil;
	559	+ }
	560	+
	561	+ public void setAntil(String antil) {
	562	+ this.antil = antil;
	563	+ }
	564	+
	565	+ public String getDimer() {
	566	+ return dimer;
	567	+ }
	568	+
	569	+ public void setDimer(String dimer) {
	570	+ this.dimer = dimer;
	571	+ }
	572	+
	573	+ public String getTotalChol() {
	574	+ return totalChol;
	575	+ }
	576	+
	577	+ public void setTotalChol(String totalChol) {
	578	+ this.totalChol = totalChol;
	579	+ }
	580	+
	581	+ public String getTricer() {
	582	+ return tricer;
	583	+ }
	584	+
	585	+ public void setTricer(String tricer) {
	586	+ this.tricer = tricer;
	587	+ }
	588	+
	589	+ public String getHighDens() {
	590	+ return highDens;
	591	+ }
	592	+
	593	+ public void setHighDens(String highDens) {
	594	+ this.highDens = highDens;
	595	+ }
	596	+
	597	+ public String getLowDens() {
	598	+ return lowDens;
	599	+ }
	600	+
	601	+ public void setLowDens(String lowDens) {
	602	+ this.lowDens = lowDens;
	603	+ }
	604	+
	605	+ public String getApolipa() {
	606	+ return apolipa;
	607	+ }
	608	+
	609	+ public void setApolipa(String apolipa) {
	610	+ this.apolipa = apolipa;
	611	+ }
	612	+
	613	+ public String getApolipb() {
	614	+ return apolipb;
	615	+ }
	616	+
	617	+ public void setApolipb(String apolipb) {
	618	+ this.apolipb = apolipb;
	619	+ }
	620	+
	621	+ public String getElectr() {
	622	+ return electr;
	623	+ }
	624	+
	625	+ public void setElectr(String electr) {
	626	+ this.electr = electr;
	627	+ }
	628	+
394	629	public String getHighriskDesc() {
395	630	return highriskDesc;
396	631	}
...	...	@@ -1295,6 +1530,30 @@
1295	1530
1296	1531	public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
1297	1532	if (null != antExChuModel) {
	1533	+ setTtita(antExChuModel.getTtita());
	1534	+ setTotalThy(antExChuModel.getTotalThy());
	1535	+ setFtita(antExChuModel.getFtita());
	1536	+ setFreeThy(antExChuModel.getFreeThy());
	1537	+ setThyStim(antExChuModel.getThyStim());
	1538	+ setAntGlan(antExChuModel.getAntGlan());
	1539	+ setTmab(antExChuModel.getTmab());
	1540	+ setThyPerAnt(antExChuModel.getThyPerAnt());
	1541	+ setProthTime(antExChuModel.getProthTime());
	1542	+ setInterStan(antExChuModel.getInterStan());
	1543	+ setPta(antExChuModel.getPta());
	1544	+ setActPar(antExChuModel.getActPar());
	1545	+ setThrTime(antExChuModel.getThrTime());
	1546	+ setFibrin(antExChuModel.getFibrin());
	1547	+ setAntil(antExChuModel.getAntil());
	1548	+ setDimer(antExChuModel.getDimer());
	1549	+ setTotalChol(antExChuModel.getTotalChol());
	1550	+ setTricer(antExChuModel.getTricer());
	1551	+ setHighDens(antExChuModel.getHighDens());
	1552	+ setLowDens(antExChuModel.getLowDens());
	1553	+ setApolipa(antExChuModel.getApolipa());
	1554	+ setApolipb(antExChuModel.getApolipb());
	1555	+ setElectr(antExChuModel.getElectr());
	1556	+
1298	1557	setHighriskDesc(antExChuModel.getHighriskDesc());
1299	1558	setSurvFetus(antExChuModel.getSurvFetus());
1300	1559	setAntExcAddOthers(antExChuModel.getAntExcAddOthers());