jiangjiazhi / regional-platform

Commit 18ab86bce43c0f28e3a29a3ee2c1d7f0c7834a15

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

增加：隆化两癌-乳腺癌-乳腺X钼靶检查筛选，最后诊断筛选（隐藏临床诊断异常项）

Showing 4 changed files with 72 additions and 12 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

...	...	@@ -271,7 +271,7 @@
271	271	//rxJy选择其他的内容
272	272	private String rxJyOther;
273	273
274		- //隆化新乳腺X线检查内容,展示用到enum(LhBreastXRayContent)
	274	+ //隆化乳腺X钼靶检查内容,展示用到enum(LhBreastXRayContent)
275	275	private String rxXJc;
276	276
277	277	/**

...	...	@@ -12,6 +12,7 @@
12	12	import com.lyms.platform.common.dao.operator.MongoOper;
13	13	import com.lyms.platform.common.dao.operator.MongoQuery;
14	14	import com.lyms.platform.common.utils.StringUtils;
	15	+import org.apache.commons.collections.CollectionUtils;
15	16	import org.springframework.data.mongodb.core.query.Criteria;
16	17
17	18	import java.util.Date;
...	...	@@ -113,6 +114,27 @@
113	114	*/
114	115	private String newRxCssj;
115	116
	117	+ //隆化乳腺X钼靶检查内容
	118	+ private String rxXJc;
	119	+
	120	+ public String getRxXJc() {
	121	+ return rxXJc;
	122	+ }
	123	+
	124	+ public void setRxXJc(String rxXJc) {
	125	+ this.rxXJc = rxXJc;
	126	+ }
	127	+ //最后诊断筛选(0未见异常,1-9异常)
	128	+ private String zhJd;
	129	+
	130	+ public String getZhJd() {
	131	+ return zhJd;
	132	+ }
	133	+
	134	+ public void setZhJd(String zhJd) {
	135	+ this.zhJd = zhJd;
	136	+ }
	137	+
116	138	public String getNewRxCssj() {
117	139	return newRxCssj;
118	140	}
...	...	@@ -147,7 +169,7 @@
147	169	condition=condition.and("isSync", isSync, MongoOper.IS);
148	170	}
149	171
150		- if(null != ycRxajc ){
	172	+ if(StringUtils.isNotEmpty(ycRxajc) ){
151	173	if("sz".equals(ycRxajc)){
152	174	condition=condition.and("ycRxajc.sz", true, MongoOper.IS);
153	175	}else if("cs".equals(ycRxajc)){
154	176
155	177
156	178
157	179
158	180
159	181
160	182
161	183
...	...	@@ -156,34 +178,34 @@
156	178	condition=condition.and("ycRxajc.xx", true, MongoOper.IS);
157	179	}
158	180	}
159		- if(null != rxPgz ){
	181	+ if(StringUtils.isNotEmpty(rxPgz) ){
160	182	condition=condition.and("rxPgz.select", rxPgz, MongoOper.IS);
161	183	}
162		- if(null != rxlPgy ){
	184	+ if(StringUtils.isNotEmpty(rxlPgy ) ){
163	185	condition=condition.and("rxlPgy.select", rxlPgy, MongoOper.IS);
164	186	}
165	187
166	188
167		- if(null != provinceId){
	189	+ if(StringUtils.isNotEmpty(provinceId)){
168	190	condition=condition.and("provinceId", provinceId, MongoOper.IS);
169	191	}
170		- if(null != cityId){
	192	+ if(StringUtils.isNotEmpty(cityId)){
171	193	condition=condition.and("cityId", cityId, MongoOper.IS);
172	194	}
173		- if(null != areaId){
	195	+ if(StringUtils.isNotEmpty( areaId)){
174	196	condition=condition.and("areaId", areaId, MongoOper.IS);
175	197	}
176		- if(null != streetId){
	198	+ if(StringUtils.isNotEmpty( streetId)){
177	199	condition=condition.and("streetId", streetId, MongoOper.IS);
178	200	}
179		- if(null != hospitalId){
	201	+ if(StringUtils.isNotEmpty( hospitalId)){
180	202	condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
181	203	}
182	204
183		- if(null != residentId){
	205	+ if(StringUtils.isNotEmpty(residentId)){
184	206	condition=condition.and("residentId", residentId, MongoOper.IS);
185	207	}
186		- if(null != residentIds){
	208	+ if(CollectionUtils.isNotEmpty(residentIds)){
187	209	condition=condition.and("residentId", residentIds, MongoOper.IN);
188	210	}
189	211	if(StringUtils.isNotEmpty(rxlYyz) ){
190	212
...	...	@@ -210,8 +232,18 @@
210	232	if(null!=breastAbnormity){
211	233	condition=condition.and("breastAbnormity", breastAbnormity, MongoOper.IS);
212	234	}
213		- if(null!=newRxCssj){
	235	+ if(StringUtils.isNotEmpty(newRxCssj)){
214	236	condition=condition.and("newRxCssj", newRxCssj, MongoOper.IS);
	237	+ }
	238	+ if(StringUtils.isNotEmpty(rxXJc)){
	239	+ condition=condition.and("rxXJc", rxXJc, MongoOper.IS);
	240	+ }
	241	+ if(StringUtils.isNotEmpty(zhJd)){
	242	+ if(zhJd.equals("0")){
	243	+ condition=condition.and("zhJd.yn", "0", MongoOper.IS);
	244	+ }else {
	245	+ condition=condition.and("zhJd.yc", zhJd, MongoOper.IN);
	246	+ }
215	247	}
216	248
217	249	Criteria c = null;

...	...	@@ -104,6 +104,10 @@
104	104	query.setBreastAbnormity(queryRequest.getBreastAbnormity());
105	105	//超声所见
106	106	query.setNewRxCssj(queryRequest.getNewRxCssj());
	107	+ //隆化乳腺X钼靶检查
	108	+ query.setRxXJc(queryRequest.getRxXJc());
	109	+ //最后诊断内容字段 yn(0未见异常,1异常);yc(异常项1-9)
	110	+ query.setZhJd(queryRequest.getZhJd());
107	111	List list = new ArrayList();
108	112	//System.out.println(query.convertToQuery().convertToMongoQuery());
109	113	List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);

1	1	package com.lyms.platform.operate.web.request;
2	2
	3	+import java.util.Map;
	4	+
3	5	/**
4	6	* @auther yangfei
5	7	* @createTime 2017年09月15日 09时49分
...	...	@@ -61,6 +63,28 @@
61	63	* 超声所见
62	64	*/
63	65	private String newRxCssj;
	66	+
	67	+ //隆化乳腺X钼靶检查内容,展示用到enum(LhBreastXRayContent)
	68	+ private String rxXJc;
	69	+
	70	+ public String getRxXJc() {
	71	+ return rxXJc;
	72	+ }
	73	+
	74	+ public void setRxXJc(String rxXJc) {
	75	+ this.rxXJc = rxXJc;
	76	+ }
	77	+
	78	+ //最后诊断筛选(0未见异常,1-9异常)
	79	+ private String zhJd;
	80	+
	81	+ public String getZhJd() {
	82	+ return zhJd;
	83	+ }
	84	+
	85	+ public void setZhJd(String zhJd) {
	86	+ this.zhJd = zhJd;
	87	+ }
64	88
65	89	public String getNewRxCssj() {
66	90	return newRxCssj;