jiangjiazhi / regional-platform

Commit a8ab4f6bcf1004a0afdd2fdd12084a725d000831

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

两癌筛查开发

Showing 2 changed files with 247 additions and 246 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java

...	...	@@ -10,6 +10,7 @@
10	10	import org.springframework.data.mongodb.core.mapping.Document;
11	11
12	12	import java.util.Date;
	13	+import java.util.Map;
13	14
14	15	/**
15	16	* 两癌筛查
16	17
17	18
18	19
19	20
20	21
21	22
22	23
23	24
24	25
25	26
26	27
27	28
28	29
29	30
30	31
31	32
32	33
33	34
34	35
35	36
36	37
37	38
38	39
39	40
40	41
41	42
42	43
43	44
44	45
45	46
46	47
...	...	@@ -66,77 +67,77 @@
66	67	//哺乳史
67	68	private String ycFrs;
68	69	//是否接受过乳腺癌检査
69		- private String ycRxajc;
	70	+ private Map<String,String> ycRxajc;
70	71	//既往史
71	72	//乳腺手术或活检史
72		- private String jwsRxss;
	73	+ private Map<String,String> jwsRxss;
73	74	//激素替代治疗史
74		- private String jwsJstd;
	75	+ private Map<String,String> jwsJstd;
75	76	//家族史病史
76	77	//乳腺癌
77		- private String jzsRxa;
	78	+ private Map<String,String> jzsRxa;
78	79	//卵巢癌
79		- private String jzsLca;
	80	+ private Map<String,String> jzsLca;
80	81	//(二）乳腺临床检査
81	82	//皮肤左
82		- private String rxlPfz;
	83	+ private Map<String,String> rxlPfz;
83	84	//皮肤右
84		- private String rxlPfy;
	85	+ private Map<String,String> rxlPfy;
85	86	//乳头左
86		- private String rxlRtz;
	87	+ private Map<String,String> rxlRtz;
87	88	//乳头右
88		- private String rxlRty;
	89	+ private Map<String,String> rxlRty;
89	90	//溢液左
90		- private String rxlYyz;
	91	+ private Map<String,String> rxlYyz;
91	92	//溢液右
92		- private String rxlYyy;
	93	+ private Map<String,String> rxlYyy;
93	94	//肿块左
94		- private String rxlZkz;
	95	+ private Map<String,String> rxlZkz;
95	96	//肿块右
96		- private String rxlZky;
	97	+ private Map<String,String> rxlZky;
97	98	//大小左
98		- private String rxlDxz;
	99	+ private Map<String,String> rxlDxz;
99	100	//大小右
100		- private String rxlDxy;
	101	+ private Map<String,String> rxlDxy;
101	102	//形状左
102		- private String rxlXzz;
	103	+ private Map<String,String> rxlXzz;
103	104	//形状右
104		- private String rxlXzy;
	105	+ private Map<String,String> rxlXzy;
105	106	//硬度左
106		- private String rxlYdz;
	107	+ private Map<String,String> rxlYdz;
107	108	//硬度右
108		- private String rxlYdy;
	109	+ private Map<String,String> rxlYdy;
109	110	//边缘左
110		- private String rxlByz;
	111	+ private Map<String,String> rxlByz;
111	112	//边缘右
112		- private String rxlByy;
	113	+ private Map<String,String> rxlByy;
113	114	//表面左
114		- private String rxlBmz;
	115	+ private Map<String,String> rxlBmz;
115	116	//表面右
116		- private String rxlBmy;
	117	+ private Map<String,String> rxlBmy;
117	118	//活动度左
118		- private String rxlHddz;
	119	+ private Map<String,String> rxlHddz;
119	120	//活动度右
120		- private String rxlHddy;
	121	+ private Map<String,String> rxlHddy;
121	122	//副乳1.无2.有
122	123	private String rxlFr;
123	124	//腋淋巴结左
124		- private String rxlYlbz;
	125	+ private Map<String,String> rxlYlbz;
125	126	//腋淋巴结右
126		- private String rxlYlby;
	127	+ private Map<String,String> rxlYlby;
127	128	//锁骨上淋巴结左
128		- private String rxlSglbz;
	129	+ private Map<String,String> rxlSglbz;
129	130	//锁骨上淋巴结右
130		- private String rxlSglby;
	131	+ private Map<String,String> rxlSglby;
131	132	//临床检査结果
132		- private String rxlJcjg;
	133	+ private Map<String,String> rxlJcjg;
133	134	//(三）乳腺彩色超声检査
134	135	//超声所见
135	136	private String rxCssj;
136	137	//分类左
137		- private String rxFlz;
	138	+ private Map<String,String> rxFlz;
138	139	//分类右
139		- private String rxlFly;
	140	+ private Map<String,String> rxlFly;
140	141	//建议
141	142	private String rxlJy;
142	143	//检查机构
143	144
...	...	@@ -147,9 +148,9 @@
147	148	private Date rxlJcrq;
148	149	//(四〉乳腺X线检査（未作X线检査不填写此项）
149	150	//乳腺X线评估左
150		- private String rxPgz;
	151	+ private Map<String,String> rxPgz;
151	152	//乳腺X线评估右
152		- private String rxlPgy;
	153	+ private Map<String,String> rxlPgy;
153	154	//建议
154	155	private String rxJy;
155	156	//(五〉最终随访结果
156	157
...	...	@@ -164,9 +165,9 @@
164	165	//病理检査日期
165	166	private Date sfJcrq;
166	167	//最后诊断
167		- private String sfZhzd;
	168	+ private Map<String,String> sfZhzd;
168	169	//TNM分期
169		- private String sfTnm;
	170	+ private Map<String,String> sfTnm;
170	171	//诊治机构
171	172	private String sfZzjg;
172	173	//诊治日期
173	174
174	175
175	176
176	177
177	178
178	179
179	180
180	181
181	182
182	183
183	184
184	185
185	186
186	187
187	188
188	189
189	190
190	191
191	192
192	193
193	194
194	195
195	196
196	197
197	198
198	199
199	200
200	201
201	202
202	203
203	204
204	205
205	206
206	207
207	208
208	209
209	210
210	211
211	212
212	213
213	214
214	215
215	216
216	217
217	218
218	219
219	220
220	221
221	222
...	...	@@ -405,203 +406,203 @@
405	406	this.ycFrs = ycFrs;
406	407	}
407	408
408		- public String getYcRxajc() {
	409	+ public Map<String, String> getYcRxajc() {
409	410	return ycRxajc;
410	411	}
411	412
412		- public void setYcRxajc(String ycRxajc) {
	413	+ public void setYcRxajc(Map<String, String> ycRxajc) {
413	414	this.ycRxajc = ycRxajc;
414	415	}
415	416
416		- public String getJwsRxss() {
	417	+ public Map<String, String> getJwsRxss() {
417	418	return jwsRxss;
418	419	}
419	420
420		- public void setJwsRxss(String jwsRxss) {
	421	+ public void setJwsRxss(Map<String, String> jwsRxss) {
421	422	this.jwsRxss = jwsRxss;
422	423	}
423	424
424		- public String getJwsJstd() {
	425	+ public Map<String, String> getJwsJstd() {
425	426	return jwsJstd;
426	427	}
427	428
428		- public void setJwsJstd(String jwsJstd) {
	429	+ public void setJwsJstd(Map<String, String> jwsJstd) {
429	430	this.jwsJstd = jwsJstd;
430	431	}
431	432
432		- public String getJzsRxa() {
	433	+ public Map<String, String> getJzsRxa() {
433	434	return jzsRxa;
434	435	}
435	436
436		- public void setJzsRxa(String jzsRxa) {
	437	+ public void setJzsRxa(Map<String, String> jzsRxa) {
437	438	this.jzsRxa = jzsRxa;
438	439	}
439	440
440		- public String getJzsLca() {
	441	+ public Map<String, String> getJzsLca() {
441	442	return jzsLca;
442	443	}
443	444
444		- public void setJzsLca(String jzsLca) {
	445	+ public void setJzsLca(Map<String, String> jzsLca) {
445	446	this.jzsLca = jzsLca;
446	447	}
447	448
448		- public String getRxlPfz() {
	449	+ public Map<String, String> getRxlPfz() {
449	450	return rxlPfz;
450	451	}
451	452
452		- public void setRxlPfz(String rxlPfz) {
	453	+ public void setRxlPfz(Map<String, String> rxlPfz) {
453	454	this.rxlPfz = rxlPfz;
454	455	}
455	456
456		- public String getRxlPfy() {
	457	+ public Map<String, String> getRxlPfy() {
457	458	return rxlPfy;
458	459	}
459	460
460		- public void setRxlPfy(String rxlPfy) {
	461	+ public void setRxlPfy(Map<String, String> rxlPfy) {
461	462	this.rxlPfy = rxlPfy;
462	463	}
463	464
464		- public String getRxlRtz() {
	465	+ public Map<String, String> getRxlRtz() {
465	466	return rxlRtz;
466	467	}
467	468
468		- public void setRxlRtz(String rxlRtz) {
	469	+ public void setRxlRtz(Map<String, String> rxlRtz) {
469	470	this.rxlRtz = rxlRtz;
470	471	}
471	472
472		- public String getRxlRty() {
	473	+ public Map<String, String> getRxlRty() {
473	474	return rxlRty;
474	475	}
475	476
476		- public void setRxlRty(String rxlRty) {
	477	+ public void setRxlRty(Map<String, String> rxlRty) {
477	478	this.rxlRty = rxlRty;
478	479	}
479	480
480		- public String getRxlYyz() {
	481	+ public Map<String, String> getRxlYyz() {
481	482	return rxlYyz;
482	483	}
483	484
484		- public void setRxlYyz(String rxlYyz) {
	485	+ public void setRxlYyz(Map<String, String> rxlYyz) {
485	486	this.rxlYyz = rxlYyz;
486	487	}
487	488
488		- public String getRxlYyy() {
	489	+ public Map<String, String> getRxlYyy() {
489	490	return rxlYyy;
490	491	}
491	492
492		- public void setRxlYyy(String rxlYyy) {
	493	+ public void setRxlYyy(Map<String, String> rxlYyy) {
493	494	this.rxlYyy = rxlYyy;
494	495	}
495	496
496		- public String getRxlZkz() {
	497	+ public Map<String, String> getRxlZkz() {
497	498	return rxlZkz;
498	499	}
499	500
500		- public void setRxlZkz(String rxlZkz) {
	501	+ public void setRxlZkz(Map<String, String> rxlZkz) {
501	502	this.rxlZkz = rxlZkz;
502	503	}
503	504
504		- public String getRxlZky() {
	505	+ public Map<String, String> getRxlZky() {
505	506	return rxlZky;
506	507	}
507	508
508		- public void setRxlZky(String rxlZky) {
	509	+ public void setRxlZky(Map<String, String> rxlZky) {
509	510	this.rxlZky = rxlZky;
510	511	}
511	512
512		- public String getRxlDxz() {
	513	+ public Map<String, String> getRxlDxz() {
513	514	return rxlDxz;
514	515	}
515	516
516		- public void setRxlDxz(String rxlDxz) {
	517	+ public void setRxlDxz(Map<String, String> rxlDxz) {
517	518	this.rxlDxz = rxlDxz;
518	519	}
519	520
520		- public String getRxlDxy() {
	521	+ public Map<String, String> getRxlDxy() {
521	522	return rxlDxy;
522	523	}
523	524
524		- public void setRxlDxy(String rxlDxy) {
	525	+ public void setRxlDxy(Map<String, String> rxlDxy) {
525	526	this.rxlDxy = rxlDxy;
526	527	}
527	528
528		- public String getRxlXzz() {
	529	+ public Map<String, String> getRxlXzz() {
529	530	return rxlXzz;
530	531	}
531	532
532		- public void setRxlXzz(String rxlXzz) {
	533	+ public void setRxlXzz(Map<String, String> rxlXzz) {
533	534	this.rxlXzz = rxlXzz;
534	535	}
535	536
536		- public String getRxlXzy() {
	537	+ public Map<String, String> getRxlXzy() {
537	538	return rxlXzy;
538	539	}
539	540
540		- public void setRxlXzy(String rxlXzy) {
	541	+ public void setRxlXzy(Map<String, String> rxlXzy) {
541	542	this.rxlXzy = rxlXzy;
542	543	}
543	544
544		- public String getRxlYdz() {
	545	+ public Map<String, String> getRxlYdz() {
545	546	return rxlYdz;
546	547	}
547	548
548		- public void setRxlYdz(String rxlYdz) {
	549	+ public void setRxlYdz(Map<String, String> rxlYdz) {
549	550	this.rxlYdz = rxlYdz;
550	551	}
551	552
552		- public String getRxlYdy() {
	553	+ public Map<String, String> getRxlYdy() {
553	554	return rxlYdy;
554	555	}
555	556
556		- public void setRxlYdy(String rxlYdy) {
	557	+ public void setRxlYdy(Map<String, String> rxlYdy) {
557	558	this.rxlYdy = rxlYdy;
558	559	}
559	560
560		- public String getRxlByz() {
	561	+ public Map<String, String> getRxlByz() {
561	562	return rxlByz;
562	563	}
563	564
564		- public void setRxlByz(String rxlByz) {
	565	+ public void setRxlByz(Map<String, String> rxlByz) {
565	566	this.rxlByz = rxlByz;
566	567	}
567	568
568		- public String getRxlByy() {
	569	+ public Map<String, String> getRxlByy() {
569	570	return rxlByy;
570	571	}
571	572
572		- public void setRxlByy(String rxlByy) {
	573	+ public void setRxlByy(Map<String, String> rxlByy) {
573	574	this.rxlByy = rxlByy;
574	575	}
575	576
576		- public String getRxlBmz() {
	577	+ public Map<String, String> getRxlBmz() {
577	578	return rxlBmz;
578	579	}
579	580
580		- public void setRxlBmz(String rxlBmz) {
	581	+ public void setRxlBmz(Map<String, String> rxlBmz) {
581	582	this.rxlBmz = rxlBmz;
582	583	}
583	584
584		- public String getRxlBmy() {
	585	+ public Map<String, String> getRxlBmy() {
585	586	return rxlBmy;
586	587	}
587	588
588		- public void setRxlBmy(String rxlBmy) {
	589	+ public void setRxlBmy(Map<String, String> rxlBmy) {
589	590	this.rxlBmy = rxlBmy;
590	591	}
591	592
592		- public String getRxlHddz() {
	593	+ public Map<String, String> getRxlHddz() {
593	594	return rxlHddz;
594	595	}
595	596
596		- public void setRxlHddz(String rxlHddz) {
	597	+ public void setRxlHddz(Map<String, String> rxlHddz) {
597	598	this.rxlHddz = rxlHddz;
598	599	}
599	600
600		- public String getRxlHddy() {
	601	+ public Map<String, String> getRxlHddy() {
601	602	return rxlHddy;
602	603	}
603	604
604		- public void setRxlHddy(String rxlHddy) {
	605	+ public void setRxlHddy(Map<String, String> rxlHddy) {
605	606	this.rxlHddy = rxlHddy;
606	607	}
607	608
608	609
609	610
610	611
611	612
612	613
613	614
614	615
615	616
616	617
...	...	@@ -613,43 +614,43 @@
613	614	this.rxlFr = rxlFr;
614	615	}
615	616
616		- public String getRxlYlbz() {
	617	+ public Map<String, String> getRxlYlbz() {
617	618	return rxlYlbz;
618	619	}
619	620
620		- public void setRxlYlbz(String rxlYlbz) {
	621	+ public void setRxlYlbz(Map<String, String> rxlYlbz) {
621	622	this.rxlYlbz = rxlYlbz;
622	623	}
623	624
624		- public String getRxlYlby() {
	625	+ public Map<String, String> getRxlYlby() {
625	626	return rxlYlby;
626	627	}
627	628
628		- public void setRxlYlby(String rxlYlby) {
	629	+ public void setRxlYlby(Map<String, String> rxlYlby) {
629	630	this.rxlYlby = rxlYlby;
630	631	}
631	632
632		- public String getRxlSglbz() {
	633	+ public Map<String, String> getRxlSglbz() {
633	634	return rxlSglbz;
634	635	}
635	636
636		- public void setRxlSglbz(String rxlSglbz) {
	637	+ public void setRxlSglbz(Map<String, String> rxlSglbz) {
637	638	this.rxlSglbz = rxlSglbz;
638	639	}
639	640
640		- public String getRxlSglby() {
	641	+ public Map<String, String> getRxlSglby() {
641	642	return rxlSglby;
642	643	}
643	644
644		- public void setRxlSglby(String rxlSglby) {
	645	+ public void setRxlSglby(Map<String, String> rxlSglby) {
645	646	this.rxlSglby = rxlSglby;
646	647	}
647	648
648		- public String getRxlJcjg() {
	649	+ public Map<String, String> getRxlJcjg() {
649	650	return rxlJcjg;
650	651	}
651	652
652		- public void setRxlJcjg(String rxlJcjg) {
	653	+ public void setRxlJcjg(Map<String, String> rxlJcjg) {
653	654	this.rxlJcjg = rxlJcjg;
654	655	}
655	656
656	657
657	658
658	659
...	...	@@ -661,19 +662,19 @@
661	662	this.rxCssj = rxCssj;
662	663	}
663	664
664		- public String getRxFlz() {
	665	+ public Map<String, String> getRxFlz() {
665	666	return rxFlz;
666	667	}
667	668
668		- public void setRxFlz(String rxFlz) {
	669	+ public void setRxFlz(Map<String, String> rxFlz) {
669	670	this.rxFlz = rxFlz;
670	671	}
671	672
672		- public String getRxlFly() {
	673	+ public Map<String, String> getRxlFly() {
673	674	return rxlFly;
674	675	}
675	676
676		- public void setRxlFly(String rxlFly) {
	677	+ public void setRxlFly(Map<String, String> rxlFly) {
677	678	this.rxlFly = rxlFly;
678	679	}
679	680
680	681
681	682
682	683
...	...	@@ -701,19 +702,19 @@
701	702	this.rxlJcry = rxlJcry;
702	703	}
703	704
704		- public String getRxPgz() {
	705	+ public Map<String, String> getRxPgz() {
705	706	return rxPgz;
706	707	}
707	708
708		- public void setRxPgz(String rxPgz) {
	709	+ public void setRxPgz(Map<String, String> rxPgz) {
709	710	this.rxPgz = rxPgz;
710	711	}
711	712
712		- public String getRxlPgy() {
	713	+ public Map<String, String> getRxlPgy() {
713	714	return rxlPgy;
714	715	}
715	716
716		- public void setRxlPgy(String rxlPgy) {
	717	+ public void setRxlPgy(Map<String, String> rxlPgy) {
717	718	this.rxlPgy = rxlPgy;
718	719	}
719	720
720	721
721	722
722	723
...	...	@@ -757,19 +758,19 @@
757	758	this.sfBlzd = sfBlzd;
758	759	}
759	760
760		- public String getSfZhzd() {
	761	+ public Map<String, String> getSfZhzd() {
761	762	return sfZhzd;
762	763	}
763	764
764		- public void setSfZhzd(String sfZhzd) {
	765	+ public void setSfZhzd(Map<String, String> sfZhzd) {
765	766	this.sfZhzd = sfZhzd;
766	767	}
767	768
768		- public String getSfTnm() {
	769	+ public Map<String, String> getSfTnm() {
769	770	return sfTnm;
770	771	}
771	772
772		- public void setSfTnm(String sfTnm) {
	773	+ public void setSfTnm(Map<String, String> sfTnm) {
773	774	this.sfTnm = sfTnm;
774	775	}
775	776
...	...	@@ -781,7 +782,6 @@
781	782	this.sfZzjg = sfZzjg;
782	783	}
783	784
784		-
785	785	public String getSfJszl() {
786	786	return sfJszl;
787	787	}
...	...	@@ -790,14 +790,6 @@
790	790	this.sfJszl = sfJszl;
791	791	}
792	792
793		- public Date getSfJcsj() {
794		- return sfJcsj;
795		- }
796		-
797		- public void setSfJcsj(Date sfJcsj) {
798		- this.sfJcsj = sfJcsj;
799		- }
800		-
801	793	public String getSfJcjg() {
802	794	return sfJcjg;
803	795	}
...	...	@@ -812,6 +804,14 @@
812	804
813	805	public void setSfJcry(String sfJcry) {
814	806	this.sfJcry = sfJcry;
	807	+ }
	808	+
	809	+ public Date getSfJcsj() {
	810	+ return sfJcsj;
	811	+ }
	812	+
	813	+ public void setSfJcsj(Date sfJcsj) {
	814	+ this.sfJcsj = sfJcsj;
815	815	}
816	816
817	817	public Date getModified() {

...	...	@@ -12,6 +12,7 @@
12	12	import com.lyms.platform.common.dao.operator.MongoQuery;
13	13
14	14	import java.util.Date;
	15	+import java.util.Map;
15	16
16	17	/**
17	18	* 两癌筛查
18	19
19	20
20	21
21	22
22	23
23	24
24	25
25	26
26	27
27	28
28	29
29	30
30	31
31	32
32	33
33	34
34	35
35	36
36	37
37	38
38	39
39	40
40	41
41	42
42	43
43	44
44	45
45	46
46	47
47	48
48	49
49	50
...	...	@@ -62,80 +63,80 @@
62	63	private String ycCc;
63	64	//初产年龄(岁)
64	65	private String ycAge;
65		- //哺乳史
	66	+ //哺乳史（1、6个月以上、2-6个月以下）
66	67	private String ycFrs;
67	68	//是否接受过乳腺癌检査
68		- private String ycRxajc;
	69	+ private Map<String,String> ycRxajc;
69	70	//既往史
70	71	//乳腺手术或活检史
71		- private String jwsRxss;
	72	+ private Map<String,String> jwsRxss;
72	73	//激素替代治疗史
73		- private String jwsJstd;
	74	+ private Map<String,String> jwsJstd;
74	75	//家族史病史
75	76	//乳腺癌
76		- private String jzsRxa;
	77	+ private Map<String,String> jzsRxa;
77	78	//卵巢癌
78		- private String jzsLca;
	79	+ private Map<String,String> jzsLca;
79	80	//(二）乳腺临床检査
80	81	//皮肤左
81		- private String rxlPfz;
	82	+ private Map<String,String> rxlPfz;
82	83	//皮肤右
83		- private String rxlPfy;
	84	+ private Map<String,String> rxlPfy;
84	85	//乳头左
85		- private String rxlRtz;
	86	+ private Map<String,String> rxlRtz;
86	87	//乳头右
87		- private String rxlRty;
	88	+ private Map<String,String> rxlRty;
88	89	//溢液左
89		- private String rxlYyz;
	90	+ private Map<String,String> rxlYyz;
90	91	//溢液右
91		- private String rxlYyy;
	92	+ private Map<String,String> rxlYyy;
92	93	//肿块左
93		- private String rxlZkz;
	94	+ private Map<String,String> rxlZkz;
94	95	//肿块右
95		- private String rxlZky;
	96	+ private Map<String,String> rxlZky;
96	97	//大小左
97		- private String rxlDxz;
	98	+ private Map<String,String> rxlDxz;
98	99	//大小右
99		- private String rxlDxy;
	100	+ private Map<String,String> rxlDxy;
100	101	//形状左
101		- private String rxlXzz;
	102	+ private Map<String,String> rxlXzz;
102	103	//形状右
103		- private String rxlXzy;
	104	+ private Map<String,String> rxlXzy;
104	105	//硬度左
105		- private String rxlYdz;
	106	+ private Map<String,String> rxlYdz;
106	107	//硬度右
107		- private String rxlYdy;
	108	+ private Map<String,String> rxlYdy;
108	109	//边缘左
109		- private String rxlByz;
	110	+ private Map<String,String> rxlByz;
110	111	//边缘右
111		- private String rxlByy;
	112	+ private Map<String,String> rxlByy;
112	113	//表面左
113		- private String rxlBmz;
	114	+ private Map<String,String> rxlBmz;
114	115	//表面右
115		- private String rxlBmy;
	116	+ private Map<String,String> rxlBmy;
116	117	//活动度左
117		- private String rxlHddz;
	118	+ private Map<String,String> rxlHddz;
118	119	//活动度右
119		- private String rxlHddy;
	120	+ private Map<String,String> rxlHddy;
120	121	//副乳1.无2.有
121	122	private String rxlFr;
122	123	//腋淋巴结左
123		- private String rxlYlbz;
	124	+ private Map<String,String> rxlYlbz;
124	125	//腋淋巴结右
125		- private String rxlYlby;
	126	+ private Map<String,String> rxlYlby;
126	127	//锁骨上淋巴结左
127		- private String rxlSglbz;
	128	+ private Map<String,String> rxlSglbz;
128	129	//锁骨上淋巴结右
129		- private String rxlSglby;
	130	+ private Map<String,String> rxlSglby;
130	131	//临床检査结果
131		- private String rxlJcjg;
	132	+ private Map<String,String> rxlJcjg;
132	133	//(三）乳腺彩色超声检査
133	134	//超声所见
134	135	private String rxCssj;
135	136	//分类左
136		- private String rxFlz;
	137	+ private Map<String,String> rxFlz;
137	138	//分类右
138		- private String rxlFly;
	139	+ private Map<String,String> rxlFly;
139	140	//建议
140	141	private String rxlJy;
141	142	//检查机构
142	143
...	...	@@ -146,9 +147,9 @@
146	147	private Date rxlJcrq;
147	148	//(四〉乳腺X线检査（未作X线检査不填写此项）
148	149	//乳腺X线评估左
149		- private String rxPgz;
	150	+ private Map<String,String> rxPgz;
150	151	//乳腺X线评估右
151		- private String rxlPgy;
	152	+ private Map<String,String> rxlPgy;
152	153	//建议
153	154	private String rxJy;
154	155	//(五〉最终随访结果
155	156
...	...	@@ -163,9 +164,9 @@
163	164	//病理检査日期
164	165	private Date sfJcrq;
165	166	//最后诊断
166		- private String sfZhzd;
	167	+ private Map<String,String> sfZhzd;
167	168	//TNM分期
168		- private String sfTnm;
	169	+ private Map<String,String> sfTnm;
169	170	//诊治机构
170	171	private String sfZzjg;
171	172	//诊治日期
172	173
173	174
174	175
175	176
176	177
177	178
178	179
179	180
180	181
181	182
182	183
183	184
184	185
185	186
186	187
187	188
188	189
189	190
190	191
191	192
192	193
193	194
194	195
195	196
196	197
197	198
198	199
199	200
200	201
201	202
202	203
203	204
204	205
205	206
206	207
207	208
208	209
209	210
210	211
211	212
212	213
213	214
214	215
215	216
216	217
217	218
218	219
219	220
220	221
...	...	@@ -416,203 +417,203 @@
416	417	this.ycFrs = ycFrs;
417	418	}
418	419
419		- public String getYcRxajc() {
	420	+ public Map<String, String> getYcRxajc() {
420	421	return ycRxajc;
421	422	}
422	423
423		- public void setYcRxajc(String ycRxajc) {
	424	+ public void setYcRxajc(Map<String, String> ycRxajc) {
424	425	this.ycRxajc = ycRxajc;
425	426	}
426	427
427		- public String getJwsRxss() {
	428	+ public Map<String, String> getJwsRxss() {
428	429	return jwsRxss;
429	430	}
430	431
431		- public void setJwsRxss(String jwsRxss) {
	432	+ public void setJwsRxss(Map<String, String> jwsRxss) {
432	433	this.jwsRxss = jwsRxss;
433	434	}
434	435
435		- public String getJwsJstd() {
	436	+ public Map<String, String> getJwsJstd() {
436	437	return jwsJstd;
437	438	}
438	439
439		- public void setJwsJstd(String jwsJstd) {
	440	+ public void setJwsJstd(Map<String, String> jwsJstd) {
440	441	this.jwsJstd = jwsJstd;
441	442	}
442	443
443		- public String getJzsRxa() {
	444	+ public Map<String, String> getJzsRxa() {
444	445	return jzsRxa;
445	446	}
446	447
447		- public void setJzsRxa(String jzsRxa) {
	448	+ public void setJzsRxa(Map<String, String> jzsRxa) {
448	449	this.jzsRxa = jzsRxa;
449	450	}
450	451
451		- public String getJzsLca() {
	452	+ public Map<String, String> getJzsLca() {
452	453	return jzsLca;
453	454	}
454	455
455		- public void setJzsLca(String jzsLca) {
	456	+ public void setJzsLca(Map<String, String> jzsLca) {
456	457	this.jzsLca = jzsLca;
457	458	}
458	459
459		- public String getRxlPfz() {
	460	+ public Map<String, String> getRxlPfz() {
460	461	return rxlPfz;
461	462	}
462	463
463		- public void setRxlPfz(String rxlPfz) {
	464	+ public void setRxlPfz(Map<String, String> rxlPfz) {
464	465	this.rxlPfz = rxlPfz;
465	466	}
466	467
467		- public String getRxlPfy() {
	468	+ public Map<String, String> getRxlPfy() {
468	469	return rxlPfy;
469	470	}
470	471
471		- public void setRxlPfy(String rxlPfy) {
	472	+ public void setRxlPfy(Map<String, String> rxlPfy) {
472	473	this.rxlPfy = rxlPfy;
473	474	}
474	475
475		- public String getRxlRtz() {
	476	+ public Map<String, String> getRxlRtz() {
476	477	return rxlRtz;
477	478	}
478	479
479		- public void setRxlRtz(String rxlRtz) {
	480	+ public void setRxlRtz(Map<String, String> rxlRtz) {
480	481	this.rxlRtz = rxlRtz;
481	482	}
482	483
483		- public String getRxlRty() {
	484	+ public Map<String, String> getRxlRty() {
484	485	return rxlRty;
485	486	}
486	487
487		- public void setRxlRty(String rxlRty) {
	488	+ public void setRxlRty(Map<String, String> rxlRty) {
488	489	this.rxlRty = rxlRty;
489	490	}
490	491
491		- public String getRxlYyz() {
	492	+ public Map<String, String> getRxlYyz() {
492	493	return rxlYyz;
493	494	}
494	495
495		- public void setRxlYyz(String rxlYyz) {
	496	+ public void setRxlYyz(Map<String, String> rxlYyz) {
496	497	this.rxlYyz = rxlYyz;
497	498	}
498	499
499		- public String getRxlYyy() {
	500	+ public Map<String, String> getRxlYyy() {
500	501	return rxlYyy;
501	502	}
502	503
503		- public void setRxlYyy(String rxlYyy) {
	504	+ public void setRxlYyy(Map<String, String> rxlYyy) {
504	505	this.rxlYyy = rxlYyy;
505	506	}
506	507
507		- public String getRxlZkz() {
	508	+ public Map<String, String> getRxlZkz() {
508	509	return rxlZkz;
509	510	}
510	511
511		- public void setRxlZkz(String rxlZkz) {
	512	+ public void setRxlZkz(Map<String, String> rxlZkz) {
512	513	this.rxlZkz = rxlZkz;
513	514	}
514	515
515		- public String getRxlZky() {
	516	+ public Map<String, String> getRxlZky() {
516	517	return rxlZky;
517	518	}
518	519
519		- public void setRxlZky(String rxlZky) {
	520	+ public void setRxlZky(Map<String, String> rxlZky) {
520	521	this.rxlZky = rxlZky;
521	522	}
522	523
523		- public String getRxlDxz() {
	524	+ public Map<String, String> getRxlDxz() {
524	525	return rxlDxz;
525	526	}
526	527
527		- public void setRxlDxz(String rxlDxz) {
	528	+ public void setRxlDxz(Map<String, String> rxlDxz) {
528	529	this.rxlDxz = rxlDxz;
529	530	}
530	531
531		- public String getRxlDxy() {
	532	+ public Map<String, String> getRxlDxy() {
532	533	return rxlDxy;
533	534	}
534	535
535		- public void setRxlDxy(String rxlDxy) {
	536	+ public void setRxlDxy(Map<String, String> rxlDxy) {
536	537	this.rxlDxy = rxlDxy;
537	538	}
538	539
539		- public String getRxlXzz() {
	540	+ public Map<String, String> getRxlXzz() {
540	541	return rxlXzz;
541	542	}
542	543
543		- public void setRxlXzz(String rxlXzz) {
	544	+ public void setRxlXzz(Map<String, String> rxlXzz) {
544	545	this.rxlXzz = rxlXzz;
545	546	}
546	547
547		- public String getRxlXzy() {
	548	+ public Map<String, String> getRxlXzy() {
548	549	return rxlXzy;
549	550	}
550	551
551		- public void setRxlXzy(String rxlXzy) {
	552	+ public void setRxlXzy(Map<String, String> rxlXzy) {
552	553	this.rxlXzy = rxlXzy;
553	554	}
554	555
555		- public String getRxlYdz() {
	556	+ public Map<String, String> getRxlYdz() {
556	557	return rxlYdz;
557	558	}
558	559
559		- public void setRxlYdz(String rxlYdz) {
	560	+ public void setRxlYdz(Map<String, String> rxlYdz) {
560	561	this.rxlYdz = rxlYdz;
561	562	}
562	563
563		- public String getRxlYdy() {
	564	+ public Map<String, String> getRxlYdy() {
564	565	return rxlYdy;
565	566	}
566	567
567		- public void setRxlYdy(String rxlYdy) {
	568	+ public void setRxlYdy(Map<String, String> rxlYdy) {
568	569	this.rxlYdy = rxlYdy;
569	570	}
570	571
571		- public String getRxlByz() {
	572	+ public Map<String, String> getRxlByz() {
572	573	return rxlByz;
573	574	}
574	575
575		- public void setRxlByz(String rxlByz) {
	576	+ public void setRxlByz(Map<String, String> rxlByz) {
576	577	this.rxlByz = rxlByz;
577	578	}
578	579
579		- public String getRxlByy() {
	580	+ public Map<String, String> getRxlByy() {
580	581	return rxlByy;
581	582	}
582	583
583		- public void setRxlByy(String rxlByy) {
	584	+ public void setRxlByy(Map<String, String> rxlByy) {
584	585	this.rxlByy = rxlByy;
585	586	}
586	587
587		- public String getRxlBmz() {
	588	+ public Map<String, String> getRxlBmz() {
588	589	return rxlBmz;
589	590	}
590	591
591		- public void setRxlBmz(String rxlBmz) {
	592	+ public void setRxlBmz(Map<String, String> rxlBmz) {
592	593	this.rxlBmz = rxlBmz;
593	594	}
594	595
595		- public String getRxlBmy() {
	596	+ public Map<String, String> getRxlBmy() {
596	597	return rxlBmy;
597	598	}
598	599
599		- public void setRxlBmy(String rxlBmy) {
	600	+ public void setRxlBmy(Map<String, String> rxlBmy) {
600	601	this.rxlBmy = rxlBmy;
601	602	}
602	603
603		- public String getRxlHddz() {
	604	+ public Map<String, String> getRxlHddz() {
604	605	return rxlHddz;
605	606	}
606	607
607		- public void setRxlHddz(String rxlHddz) {
	608	+ public void setRxlHddz(Map<String, String> rxlHddz) {
608	609	this.rxlHddz = rxlHddz;
609	610	}
610	611
611		- public String getRxlHddy() {
	612	+ public Map<String, String> getRxlHddy() {
612	613	return rxlHddy;
613	614	}
614	615
615		- public void setRxlHddy(String rxlHddy) {
	616	+ public void setRxlHddy(Map<String, String> rxlHddy) {
616	617	this.rxlHddy = rxlHddy;
617	618	}
618	619
619	620
620	621
621	622
622	623
623	624
624	625
625	626
626	627
627	628
...	...	@@ -624,43 +625,43 @@
624	625	this.rxlFr = rxlFr;
625	626	}
626	627
627		- public String getRxlYlbz() {
	628	+ public Map<String, String> getRxlYlbz() {
628	629	return rxlYlbz;
629	630	}
630	631
631		- public void setRxlYlbz(String rxlYlbz) {
	632	+ public void setRxlYlbz(Map<String, String> rxlYlbz) {
632	633	this.rxlYlbz = rxlYlbz;
633	634	}
634	635
635		- public String getRxlYlby() {
	636	+ public Map<String, String> getRxlYlby() {
636	637	return rxlYlby;
637	638	}
638	639
639		- public void setRxlYlby(String rxlYlby) {
	640	+ public void setRxlYlby(Map<String, String> rxlYlby) {
640	641	this.rxlYlby = rxlYlby;
641	642	}
642	643
643		- public String getRxlSglbz() {
	644	+ public Map<String, String> getRxlSglbz() {
644	645	return rxlSglbz;
645	646	}
646	647
647		- public void setRxlSglbz(String rxlSglbz) {
	648	+ public void setRxlSglbz(Map<String, String> rxlSglbz) {
648	649	this.rxlSglbz = rxlSglbz;
649	650	}
650	651
651		- public String getRxlSglby() {
	652	+ public Map<String, String> getRxlSglby() {
652	653	return rxlSglby;
653	654	}
654	655
655		- public void setRxlSglby(String rxlSglby) {
	656	+ public void setRxlSglby(Map<String, String> rxlSglby) {
656	657	this.rxlSglby = rxlSglby;
657	658	}
658	659
659		- public String getRxlJcjg() {
	660	+ public Map<String, String> getRxlJcjg() {
660	661	return rxlJcjg;
661	662	}
662	663
663		- public void setRxlJcjg(String rxlJcjg) {
	664	+ public void setRxlJcjg(Map<String, String> rxlJcjg) {
664	665	this.rxlJcjg = rxlJcjg;
665	666	}
666	667
667	668
668	669
669	670
...	...	@@ -672,19 +673,19 @@
672	673	this.rxCssj = rxCssj;
673	674	}
674	675
675		- public String getRxFlz() {
	676	+ public Map<String, String> getRxFlz() {
676	677	return rxFlz;
677	678	}
678	679
679		- public void setRxFlz(String rxFlz) {
	680	+ public void setRxFlz(Map<String, String> rxFlz) {
680	681	this.rxFlz = rxFlz;
681	682	}
682	683
683		- public String getRxlFly() {
	684	+ public Map<String, String> getRxlFly() {
684	685	return rxlFly;
685	686	}
686	687
687		- public void setRxlFly(String rxlFly) {
	688	+ public void setRxlFly(Map<String, String> rxlFly) {
688	689	this.rxlFly = rxlFly;
689	690	}
690	691
691	692
692	693
693	694
...	...	@@ -712,19 +713,27 @@
712	713	this.rxlJcry = rxlJcry;
713	714	}
714	715
715		- public String getRxPgz() {
	716	+ public Date getRxlJcrq() {
	717	+ return rxlJcrq;
	718	+ }
	719	+
	720	+ public void setRxlJcrq(Date rxlJcrq) {
	721	+ this.rxlJcrq = rxlJcrq;
	722	+ }
	723	+
	724	+ public Map<String, String> getRxPgz() {
716	725	return rxPgz;
717	726	}
718	727
719		- public void setRxPgz(String rxPgz) {
	728	+ public void setRxPgz(Map<String, String> rxPgz) {
720	729	this.rxPgz = rxPgz;
721	730	}
722	731
723		- public String getRxlPgy() {
	732	+ public Map<String, String> getRxlPgy() {
724	733	return rxlPgy;
725	734	}
726	735
727		- public void setRxlPgy(String rxlPgy) {
	736	+ public void setRxlPgy(Map<String, String> rxlPgy) {
728	737	this.rxlPgy = rxlPgy;
729	738	}
730	739
731	740
732	741
733	742
...	...	@@ -768,19 +777,27 @@
768	777	this.sfBlzd = sfBlzd;
769	778	}
770	779
771		- public String getSfZhzd() {
	780	+ public Date getSfJcrq() {
	781	+ return sfJcrq;
	782	+ }
	783	+
	784	+ public void setSfJcrq(Date sfJcrq) {
	785	+ this.sfJcrq = sfJcrq;
	786	+ }
	787	+
	788	+ public Map<String, String> getSfZhzd() {
772	789	return sfZhzd;
773	790	}
774	791
775		- public void setSfZhzd(String sfZhzd) {
	792	+ public void setSfZhzd(Map<String, String> sfZhzd) {
776	793	this.sfZhzd = sfZhzd;
777	794	}
778	795
779		- public String getSfTnm() {
	796	+ public Map<String, String> getSfTnm() {
780	797	return sfTnm;
781	798	}
782	799
783		- public void setSfTnm(String sfTnm) {
	800	+ public void setSfTnm(Map<String, String> sfTnm) {
784	801	this.sfTnm = sfTnm;
785	802	}
786	803
...	...	@@ -792,22 +809,6 @@
792	809	this.sfZzjg = sfZzjg;
793	810	}
794	811
795		- public Date getRxlJcrq() {
796		- return rxlJcrq;
797		- }
798		-
799		- public void setRxlJcrq(Date rxlJcrq) {
800		- this.rxlJcrq = rxlJcrq;
801		- }
802		-
803		- public Date getSfJcrq() {
804		- return sfJcrq;
805		- }
806		-
807		- public void setSfJcrq(Date sfJcrq) {
808		- this.sfJcrq = sfJcrq;
809		- }
810		-
811	812	public Date getSfZlrq() {
812	813	return sfZlrq;
813	814	}
...	...	@@ -816,10 +817,6 @@
816	817	this.sfZlrq = sfZlrq;
817	818	}
818	819
819		- public void setSfJcsj(Date sfJcsj) {
820		- this.sfJcsj = sfJcsj;
821		- }
822		-
823	820	public String getSfJszl() {
824	821	return sfJszl;
825	822	}
...	...	@@ -846,6 +843,10 @@
846	843
847	844	public Date getSfJcsj() {
848	845	return sfJcsj;
	846	+ }
	847	+
	848	+ public void setSfJcsj(Date sfJcsj) {
	849	+ this.sfJcsj = sfJcsj;
849	850	}
850	851	}