jiangjiazhi / regional-platform

Commit 658be9f917a007fe824fa276565bc028edeccb41

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

乳腺癌检查

Showing 4 changed files with 252 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java

...	...	@@ -69,16 +69,18 @@
69	69	//是否接受过乳腺癌检査
70	70	private Map<String,Object> ycRxajc;
71	71	//既往史
72		- //乳腺手术或活检史
	72	+ //乳腺手术或活检史(遵化新增时间 time)
73	73	private Map<String,Object> jwsRxss;
74		- //激素替代治疗史
	74	+ //激素替代治疗史(遵化新增药物 yw)
75	75	private Map<String,Object> jwsJstd;
76	76	//家族史病史
77	77	//乳腺癌
78	78	private Map<String,Object> jzsRxa;
79	79	//卵巢癌
80	80	private Map<String,Object> jzsLca;
81		- //(二）乳腺临床检査
	81	+ //遵化新增，宫颈癌字，值和上面卵巢相同
	82	+ private Map<String,Object> jzsGja;
	83	+ //(二）乳腺临床检査，全部遵化新增其它 qt
82	84	//皮肤左
83	85	private Map<String,Object> rxlPfz;
84	86	//皮肤右
...	...	@@ -87,7 +89,7 @@
87	89	private Map<String,Object> rxlRtz;
88	90	//乳头右
89	91	private Map<String,Object> rxlRty;
90		- //溢液左
	92	+ //溢液左，遵化新增，血性5 浆液性6 清水性7
91	93	private Map<String,Object> rxlYyz;
92	94	//溢液右
93	95	private Map<String,Object> rxlYyy;
...	...	@@ -95,7 +97,7 @@
95	97	private Map<String,Object> rxlZkz;
96	98	//肿块右
97	99	private Map<String,Object> rxlZky;
98		- //大小左
	100	+ //大小左，遵化新增，手输 shous
99	101	private Map<String,Object> rxlDxz;
100	102	//大小右
101	103	private Map<String,Object> rxlDxy;
102	104
...	...	@@ -103,11 +105,11 @@
103	105	private Map<String,Object> rxlXzz;
104	106	//形状右
105	107	private Map<String,Object> rxlXzy;
106		- //硬度左
	108	+ //硬度左，遵化新增，韧4
107	109	private Map<String,Object> rxlYdz;
108	110	//硬度右
109	111	private Map<String,Object> rxlYdy;
110		- //边缘左
	112	+ //边缘左，遵化新增，部分清楚 3
111	113	private Map<String,Object> rxlByz;
112	114	//边缘右
113	115	private Map<String,Object> rxlByy;
...	...	@@ -121,6 +123,8 @@
121	123	private Map<String,Object> rxlHddy;
122	124	//副乳1.无2.有
123	125	private String rxlFr;
	126	+ // 遵化新增，副乳其它
	127	+ private String rxlFrqt;
124	128	//腋淋巴结左
125	129	private Map<String,Object> rxlYlbz;
126	130	//腋淋巴结右
...	...	@@ -131,6 +135,9 @@
131	135	private Map<String,Object> rxlSglby;
132	136	//临床检査结果
133	137	private Map<String,Object> rxlJcjg;
	138	+ //遵化新增，治疗情况
	139	+ private String zlqk;
	140	+
134	141	//(三）乳腺彩色超声检査
135	142	//超声所见
136	143	private String rxCssj;
...	...	@@ -138,7 +145,7 @@
138	145	private Map<String,Object> rxFlz;
139	146	//分类右
140	147	private Map<String,Object> rxlFly;
141		- //建议
	148	+ //建议遵化新增，手术4 , 其它qt
142	149	private Map<String,Object> rxlJy;
143	150	//检查机构
144	151	private String rxlJcdw;
...	...	@@ -151,7 +158,7 @@
151	158	private Map<String,Object> rxPgz;
152	159	//乳腺X线评估右
153	160	private Map<String,Object> rxlPgy;
154		- //建议
	161	+ //建议遵化新增，手术4 , 其它qt
155	162	private Map<String,Object> rxJy;
156	163	//(五〉最终随访结果
157	164	//随访情况
...	...	@@ -180,6 +187,8 @@
180	187	private String sfJcry;
181	188	//检査日期
182	189	private Date sfJcsj;
	190	+ //下次预约时间
	191	+ private Date nextDate;
183	192
184	193	private Date modified;
185	194	private Date created;
...	...	@@ -204,6 +213,38 @@
204	213
205	214	public void setSfJcrq(Date sfJcrq) {
206	215	this.sfJcrq = sfJcrq;
	216	+ }
	217	+
	218	+ public Map <String, Object> getJzsGja() {
	219	+ return jzsGja;
	220	+ }
	221	+
	222	+ public void setJzsGja(Map <String, Object> jzsGja) {
	223	+ this.jzsGja = jzsGja;
	224	+ }
	225	+
	226	+ public String getRxlFrqt() {
	227	+ return rxlFrqt;
	228	+ }
	229	+
	230	+ public void setRxlFrqt(String rxlFrqt) {
	231	+ this.rxlFrqt = rxlFrqt;
	232	+ }
	233	+
	234	+ public String getZlqk() {
	235	+ return zlqk;
	236	+ }
	237	+
	238	+ public void setZlqk(String zlqk) {
	239	+ this.zlqk = zlqk;
	240	+ }
	241	+
	242	+ public Date getNextDate() {
	243	+ return nextDate;
	244	+ }
	245	+
	246	+ public void setNextDate(Date nextDate) {
	247	+ this.nextDate = nextDate;
207	248	}
208	249
209	250	public Date getSfZlrq() {

...	...	@@ -15,6 +15,7 @@
15	15	import org.springframework.data.mongodb.core.query.Criteria;
16	16
17	17	import java.util.Date;
	18	+import java.util.HashMap;
18	19	import java.util.Map;
19	20
20	21	/**
...	...	@@ -66,6 +67,27 @@
66	67	//医院ID
67	68	private String hospitalId;
68	69
	70	+ //溢液左，遵化新增，7清水性 1无 2单管 3多管 4乳样 5血性 6浆液性
	71	+ private String rxlYyz;
	72	+ //溢液右
	73	+ private String rxlYyy;
	74	+
	75	+ //硬度左 1软 2较硬 3硬 4韧
	76	+ private String rxlYdz;
	77	+ //硬度右
	78	+ private String rxlYdy;
	79	+
	80	+ //临床检查结果 1未见异常 2良性病变 3可疑恶性
	81	+ private String rxlJcjg;
	82	+ //乳腺彩超检查建议 1定期检查 2乳腺X射线 3活检 4手术
	83	+ private String rxlJy;
	84	+ //乳腺X线检查建议 1定期检查 2短期随访(6个月) 3活检 4手术
	85	+ private String rxJy;
	86	+
	87	+ //最终诊断结果 1未见异常 2良性疾病 3不典型增生 4原位癌 5导管内乳头状癌 6微小浸润癌 7浸润癌 8其他恶性肿瘤
	88	+ private String sfZhzd;
	89	+
	90	+
69	91	/**
70	92	* @return
71	93	*/
...	...	@@ -100,6 +122,28 @@
100	122	condition=condition.and("residentId", residentId, MongoOper.IS);
101	123	}
102	124
	125	+ if(StringUtils.isNotEmpty(rxlYyz) ){
	126	+ condition=condition.and("rxlYyz.select",rxlYyz , MongoOper.IS);
	127	+ }
	128	+ if(StringUtils.isNotEmpty(rxlYyy) ){
	129	+ condition=condition.and("rxlYyy.select",rxlYyy , MongoOper.IS);
	130	+ }
	131	+ if(StringUtils.isNotEmpty(rxlYdz) ){
	132	+ condition=condition.and("rxlYdz.select",rxlYdz , MongoOper.IS);
	133	+ }
	134	+ if(StringUtils.isNotEmpty(rxlJcjg) ){
	135	+ condition=condition.and("rxlJcjg.select",rxlJcjg , MongoOper.IS);
	136	+ }
	137	+ if(StringUtils.isNotEmpty(rxlJy) ){
	138	+ condition=condition.and("rxlJy.select",rxlJy , MongoOper.IS);
	139	+ }
	140	+ if(StringUtils.isNotEmpty(rxJy) ){
	141	+ condition=condition.and("rxJy.select",rxJy , MongoOper.IS);
	142	+ }
	143	+ if(StringUtils.isNotEmpty(sfZhzd) ){
	144	+ condition=condition.and("sfZhzd.select",sfZhzd , MongoOper.IS);
	145	+ }
	146	+
103	147	Criteria c = null;
104	148
105	149
...	...	@@ -132,6 +176,70 @@
132	176	}
133	177
134	178	return condition.toMongoQuery();
	179	+ }
	180	+
	181	+ public String getRxlYyz() {
	182	+ return rxlYyz;
	183	+ }
	184	+
	185	+ public void setRxlYyz(String rxlYyz) {
	186	+ this.rxlYyz = rxlYyz;
	187	+ }
	188	+
	189	+ public String getRxlYyy() {
	190	+ return rxlYyy;
	191	+ }
	192	+
	193	+ public void setRxlYyy(String rxlYyy) {
	194	+ this.rxlYyy = rxlYyy;
	195	+ }
	196	+
	197	+ public String getRxlYdz() {
	198	+ return rxlYdz;
	199	+ }
	200	+
	201	+ public void setRxlYdz(String rxlYdz) {
	202	+ this.rxlYdz = rxlYdz;
	203	+ }
	204	+
	205	+ public String getRxlYdy() {
	206	+ return rxlYdy;
	207	+ }
	208	+
	209	+ public void setRxlYdy(String rxlYdy) {
	210	+ this.rxlYdy = rxlYdy;
	211	+ }
	212	+
	213	+ public String getRxlJcjg() {
	214	+ return rxlJcjg;
	215	+ }
	216	+
	217	+ public void setRxlJcjg(String rxlJcjg) {
	218	+ this.rxlJcjg = rxlJcjg;
	219	+ }
	220	+
	221	+ public String getRxlJy() {
	222	+ return rxlJy;
	223	+ }
	224	+
	225	+ public void setRxlJy(String rxlJy) {
	226	+ this.rxlJy = rxlJy;
	227	+ }
	228	+
	229	+ public String getRxJy() {
	230	+ return rxJy;
	231	+ }
	232	+
	233	+ public void setRxJy(String rxJy) {
	234	+ this.rxJy = rxJy;
	235	+ }
	236	+
	237	+ public String getSfZhzd() {
	238	+ return sfZhzd;
	239	+ }
	240	+
	241	+ public void setSfZhzd(String sfZhzd) {
	242	+ this.sfZhzd = sfZhzd;
135	243	}
136	244
137	245	public String getId() {

...	...	@@ -78,8 +78,17 @@
78	78	query.setCityId(queryRequest.getCityId());
79	79	query.setAreaId(queryRequest.getAreaId());
80	80	query.setStreetId(queryRequest.getStreetId());
	81	+ query.setRxlYyz(queryRequest.getRxlYyz());
	82	+ query.setRxlYyy(queryRequest.getRxlYyy());
	83	+ query.setRxlYdz(queryRequest.getRxlYdz());
	84	+ query.setRxlYdy(queryRequest.getRxlYdy());
	85	+ query.setRxlJcjg(queryRequest.getRxlJcjg());
	86	+ query.setRxlJy(queryRequest.getRxlJy());
	87	+ query.setRxJy(queryRequest.getRxJy());
	88	+ query.setSfZhzd(queryRequest.getSfZhzd());
81	89
82	90	List list = new ArrayList();
	91	+ //System.out.println(query.convertToQuery().convertToMongoQuery());
83	92	List<CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
84	93	if (CollectionUtils.isNotEmpty(modelList)) {
85	94	for (CancerScreeningModel model : modelList) {

...	...	@@ -23,6 +23,91 @@
23	23	private String streetId;
24	24	private String address;
25	25
	26	+ //溢液左，遵化新增，7清水性 1无 2单管 3多管 4乳样 5血性 6浆液性
	27	+ private String rxlYyz;
	28	+ //溢液右
	29	+ private String rxlYyy;
	30	+
	31	+ //硬度左 1软 2较硬 3硬 4韧
	32	+ private String rxlYdz;
	33	+ //硬度右
	34	+ private String rxlYdy;
	35	+
	36	+ //临床检查结果 1未见异常 2良性病变 3可疑恶性
	37	+ private String rxlJcjg;
	38	+ //乳腺彩超检查建议 1定期检查 2乳腺X射线 3活检 4手术
	39	+ private String rxlJy;
	40	+ //乳腺X线检查建议 1定期检查 2短期随访(6个月) 3活检 4手术
	41	+ private String rxJy;
	42	+
	43	+ //最终诊断结果 1未见异常 2良性疾病 3不典型增生 4原位癌 5导管内乳头状癌 6微小浸润癌 7浸润癌 8其他恶性肿瘤
	44	+ private String sfZhzd;
	45	+
	46	+
	47	+ public String getRxlYyz() {
	48	+ return rxlYyz;
	49	+ }
	50	+
	51	+ public void setRxlYyz(String rxlYyz) {
	52	+ this.rxlYyz = rxlYyz;
	53	+ }
	54	+
	55	+ public String getRxlYyy() {
	56	+ return rxlYyy;
	57	+ }
	58	+
	59	+ public void setRxlYyy(String rxlYyy) {
	60	+ this.rxlYyy = rxlYyy;
	61	+ }
	62	+
	63	+ public String getRxlYdz() {
	64	+ return rxlYdz;
	65	+ }
	66	+
	67	+ public void setRxlYdz(String rxlYdz) {
	68	+ this.rxlYdz = rxlYdz;
	69	+ }
	70	+
	71	+ public String getRxlYdy() {
	72	+ return rxlYdy;
	73	+ }
	74	+
	75	+ public void setRxlYdy(String rxlYdy) {
	76	+ this.rxlYdy = rxlYdy;
	77	+ }
	78	+
	79	+ public String getRxlJcjg() {
	80	+ return rxlJcjg;
	81	+ }
	82	+
	83	+ public void setRxlJcjg(String rxlJcjg) {
	84	+ this.rxlJcjg = rxlJcjg;
	85	+ }
	86	+
	87	+ public String getRxlJy() {
	88	+ return rxlJy;
	89	+ }
	90	+
	91	+ public void setRxlJy(String rxlJy) {
	92	+ this.rxlJy = rxlJy;
	93	+ }
	94	+
	95	+ public String getRxJy() {
	96	+ return rxJy;
	97	+ }
	98	+
	99	+ public void setRxJy(String rxJy) {
	100	+ this.rxJy = rxJy;
	101	+ }
	102	+
	103	+ public String getSfZhzd() {
	104	+ return sfZhzd;
	105	+ }
	106	+
	107	+ public void setSfZhzd(String sfZhzd) {
	108	+ this.sfZhzd = sfZhzd;
	109	+ }
	110	+
26	111	public String getProvinceId() {
27	112	return provinceId;
28	113	}