jiangjiazhi / regional-platform

Commit 0baedc550979b515ae32614095cef8cb8776e2d4

Authored by liquanyu almost 4 years ago

Exists in master and in 6 other branches

两癌

Showing 3 changed files with 160 additions and 10 deletions

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

...	...	@@ -116,7 +116,48 @@
116	116
117	117	//隆化乳腺X钼靶检查内容
118	118	private String rxXJc;
	119	+ //1 左边 2 右边
	120	+ private String leftRight;
119	121
	122	+ //乳腺彩色超声检查
	123	+ private String rxcsLevel;
	124	+ //乳腺X检查
	125	+ private String rxxLevel;
	126	+ //最后诊断 0 未见异常 1 异常
	127	+ private String zhzd;
	128	+
	129	+ public String getZhzd() {
	130	+ return zhzd;
	131	+ }
	132	+
	133	+ public void setZhzd(String zhzd) {
	134	+ this.zhzd = zhzd;
	135	+ }
	136	+
	137	+ public String getLeftRight() {
	138	+ return leftRight;
	139	+ }
	140	+
	141	+ public void setLeftRight(String leftRight) {
	142	+ this.leftRight = leftRight;
	143	+ }
	144	+
	145	+ public String getRxcsLevel() {
	146	+ return rxcsLevel;
	147	+ }
	148	+
	149	+ public void setRxcsLevel(String rxcsLevel) {
	150	+ this.rxcsLevel = rxcsLevel;
	151	+ }
	152	+
	153	+ public String getRxxLevel() {
	154	+ return rxxLevel;
	155	+ }
	156	+
	157	+ public void setRxxLevel(String rxxLevel) {
	158	+ this.rxxLevel = rxxLevel;
	159	+ }
	160	+
120	161	public String getRxXJc() {
121	162	return rxXJc;
122	163	}
...	...	@@ -165,6 +206,9 @@
165	206	if(null != yn){
166	207	condition=condition.and("yn", yn, MongoOper.IS);
167	208	}
	209	+ if(null != zhzd){
	210	+ condition=condition.and("sfZhzd.yn", zhzd, MongoOper.IS);
	211	+ }
168	212	if(null != isSync){
169	213	condition=condition.and("isSync", isSync, MongoOper.IS);
170	214	}
...	...	@@ -184,7 +228,30 @@
184	228	if(StringUtils.isNotEmpty(rxlPgy ) ){
185	229	condition=condition.and("rxlPgy.select", rxlPgy, MongoOper.IS);
186	230	}
187		-
	231	+ if(StringUtils.isNotEmpty(leftRight) ){
	232	+ if (StringUtils.isNotEmpty(rxcsLevel))
	233	+ {
	234	+ if ("1".equals(leftRight))
	235	+ {
	236	+ condition=condition.and("rxcsLeftLevel", rxcsLevel, MongoOper.IS);
	237	+ }
	238	+ else
	239	+ {
	240	+ condition=condition.and("rxcsRightLevel", rxcsLevel, MongoOper.IS);
	241	+ }
	242	+ }
	243	+ if (StringUtils.isNotEmpty(rxxLevel))
	244	+ {
	245	+ if ("1".equals(leftRight))
	246	+ {
	247	+ condition=condition.and("rxxLeftLevel", rxxLevel, MongoOper.IS);
	248	+ }
	249	+ else
	250	+ {
	251	+ condition=condition.and("rxxRightLevel", rxxLevel, MongoOper.IS);
	252	+ }
	253	+ }
	254	+ }
188	255
189	256	if(StringUtils.isNotEmpty(provinceId)){
190	257	condition=condition.and("provinceId", provinceId, MongoOper.IS);

...	...	@@ -97,6 +97,9 @@
97	97	query.setCreatedEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1));
98	98	}
99	99
	100	+ query.setLeftRight(queryRequest.getLeftRight());
	101	+ query.setRxcsLevel(queryRequest.getRxcsLevel());
	102	+ query.setRxxLevel(queryRequest.getRxxLevel());
100	103	query.setYcRxajc(queryRequest.getYcRxajc());//是否有过乳腺检查 sz ,cs ,xx
101	104	query.setRxPgz(queryRequest.getRxPgz());//乳腺彩超分级左 "0" "1" ....
102	105	query.setRxlPgy(queryRequest.getRxlPgy());//乳腺彩超分级右
...	...	@@ -121,6 +124,7 @@
121	124	query.setRxXJc(queryRequest.getRxXJc());
122	125	//最后诊断内容字段 yn(0未见异常,1异常);yc(异常项1-9)
123	126	query.setZhJd(queryRequest.getZhJd());
	127	+ query.setZhzd(queryRequest.getZhzd());
124	128	List list = new ArrayList();
125	129	//System.out.println(query.convertToQuery().convertToMongoQuery());
126	130	List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
127	131
128	132
129	133
...	...	@@ -140,25 +144,61 @@
140	144
141	145	map.put("sfZzjg", model.getSfZzjg());//检査机构
142	146
	147	+ String rxcsLevel = "";
	148	+ if (StringUtils.isNotEmpty(model.getRxcsLeftLevel()))
	149	+ {
	150	+ rxcsLevel+="左乳:"+(Integer.parseInt(model.getRxcsLeftLevel())-1)+"级 ";
	151	+ }
	152	+ if (StringUtils.isNotEmpty(model.getRxcsRightLevel()))
	153	+ {
	154	+ rxcsLevel+="右乳:"+(Integer.parseInt(model.getRxcsRightLevel())-1)+"级 ";
	155	+ }
	156	+ map.put("rxcsLevel",rxcsLevel);//乳腺彩色超声检查等级
	157	+
	158	+ String rxxtLevel = "";
	159	+ if (StringUtils.isNotEmpty(model.getRxxLeftLevel()))
	160	+ {
	161	+ rxxtLevel+="左乳:"+(Integer.parseInt(model.getRxxLeftLevel())-1)+"级 ";
	162	+ }
	163	+ if (StringUtils.isNotEmpty(model.getRxxRightLevel()))
	164	+ {
	165	+ rxxtLevel+="右乳:"+(Integer.parseInt(model.getRxxRightLevel())-1)+"级 ";
	166	+ }
	167	+ map.put("rxxtLevel", rxxtLevel);//乳腺X检查等级
	168	+
143	169	map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
144	170	map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null));
145	171	map.put("newRxCssj",LhUltrasoundContent.getName(StringUtils.isNotEmpty(model.getNewRxCssj())?model.getNewRxCssj():null));//超声所见
146	172	map.put("rxXJc",LhBreastXRayContent.getName(StringUtils.isNotEmpty(model.getRxXJc())?model.getRxXJc():null));//隆化乳腺X钼靶检查
147	173	//最后诊断展示用到enum(LhEndDiagnosisContent)
148	174	StringBuilder zhJd=new StringBuilder();
149		- if(model.getZhJd()!=null&&model.getZhJd().size()>0){
150		- if(model.getZhJd().get("yn").toString().equals("0")){
151		- zhJd.append("未见异常");
152		- }else {
153		- for (String yc : (List<String>) model.getZhJd().get("yc")) {
154		- if(yc.equals("9")){//qt(其他注明);
155		- zhJd.append(LhEndDiagnosisContent.getName(yc)+":"+model.getZhJd().get("qt"));
156		- continue;
	175	+ if ("2100001605".equals(hospitalId))
	176	+ {
	177	+ if(model.getZhJd()!=null&&model.getZhJd().size()>0){
	178	+ if(model.getZhJd().get("yn").toString().equals("0")){
	179	+ zhJd.append("未见异常");
	180	+ }else {
	181	+ for (String yc : (List<String>) model.getZhJd().get("yc")) {
	182	+ if(yc.equals("9")){//qt(其他注明);
	183	+ zhJd.append(LhEndDiagnosisContent.getName(yc)+":"+model.getZhJd().get("qt"));
	184	+ continue;
	185	+ }
	186	+ zhJd.append(LhEndDiagnosisContent.getName(yc)+",");
157	187	}
158		- zhJd.append(LhEndDiagnosisContent.getName(yc)+",");
159	188	}
160	189	}
161	190	}
	191	+ else
	192	+ {
	193	+ if(model.getSfZhzd()!=null&&model.getSfZhzd().size()>0) {
	194	+ if (model.getSfZhzd().get("yn").toString().equals("0")) {
	195	+ zhJd.append("未见异常");
	196	+ } else {
	197	+ zhJd.append("异常");
	198	+ }
	199	+ }
	200	+ }
	201	+
162	202	map.put("zhJd",zhJd);
163	203
164	204	list.add(map);

...	...	@@ -52,6 +52,7 @@
52	52
53	53	//最终诊断结果 1未见异常 2良性疾病 3不典型增生 4原位癌 5导管内乳头状癌 6微小浸润癌 7浸润癌 8其他恶性肿瘤
54	54	private String sfZhzd;
	55	+
55	56	/**
56	57	* 隆化-乳腺癌检查异常
57	58	*/
...	...	@@ -66,6 +67,48 @@
66	67
67	68	//隆化乳腺X钼靶检查内容,展示用到enum(LhBreastXRayContent)
68	69	private String rxXJc;
	70	+
	71	+ //1 左边 2 右边
	72	+ private String leftRight;
	73	+
	74	+ //乳腺彩色超声检查
	75	+ private String rxcsLevel;
	76	+ //乳腺X检查
	77	+ private String rxxLevel;
	78	+ //最后诊断 0 未见异常 1 异常
	79	+ private String zhzd;
	80	+
	81	+ public String getZhzd() {
	82	+ return zhzd;
	83	+ }
	84	+
	85	+ public void setZhzd(String zhzd) {
	86	+ this.zhzd = zhzd;
	87	+ }
	88	+
	89	+ public String getLeftRight() {
	90	+ return leftRight;
	91	+ }
	92	+
	93	+ public void setLeftRight(String leftRight) {
	94	+ this.leftRight = leftRight;
	95	+ }
	96	+
	97	+ public String getRxcsLevel() {
	98	+ return rxcsLevel;
	99	+ }
	100	+
	101	+ public void setRxcsLevel(String rxcsLevel) {
	102	+ this.rxcsLevel = rxcsLevel;
	103	+ }
	104	+
	105	+ public String getRxxLevel() {
	106	+ return rxxLevel;
	107	+ }
	108	+
	109	+ public void setRxxLevel(String rxxLevel) {
	110	+ this.rxxLevel = rxxLevel;
	111	+ }
69	112
70	113	public String getRxXJc() {
71	114	return rxXJc;