From 18ab86bce43c0f28e3a29a3ee2c1d7f0c7834a15 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 15 Dec 2021 15:51:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9A=E9=9A=86=E5=8C=96?= =?UTF-8?q?=E4=B8=A4=E7=99=8C-=E4=B9=B3=E8=85=BA=E7=99=8C-=E4=B9=B3?= =?UTF-8?q?=E8=85=BAX=E9=92=BC=E9=9D=B6=E6=A3=80=E6=9F=A5=E7=AD=9B?= =?UTF-8?q?=E9=80=89=EF=BC=8C=E6=9C=80=E5=90=8E=E8=AF=8A=E6=96=AD=E7=AD=9B?= =?UTF-8?q?=E9=80=89=EF=BC=88=E9=9A=90=E8=97=8F=E4=B8=B4=E5=BA=8A=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E5=BC=82=E5=B8=B8=E9=A1=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/CancerScreeningModel.java | 2 +- .../lyms/platform/query/CancerScreeningQuery.java | 54 +++++++++++++++++----- .../operate/web/facade/CancerScreeningFacade.java | 4 ++ .../web/request/CancerScreeningRequest.java | 24 ++++++++++ 4 files changed, 72 insertions(+), 12 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java index b2dfdb1..8bbc089 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java @@ -271,7 +271,7 @@ public class CancerScreeningModel extends BaseModel { //rxJy选择其他的内容 private String rxJyOther; - //隆化新乳腺X线检查内容,展示用到enum(LhBreastXRayContent) + //隆化乳腺X钼靶检查内容,展示用到enum(LhBreastXRayContent) private String rxXJc; /** diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java index b0b5057..7f35c4b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; +import org.apache.commons.collections.CollectionUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -113,6 +114,27 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ */ private String newRxCssj; + //隆化乳腺X钼靶检查内容 + private String rxXJc; + + public String getRxXJc() { + return rxXJc; + } + + public void setRxXJc(String rxXJc) { + this.rxXJc = rxXJc; + } + //最后诊断 筛选(0未见异常,1-9异常) + private String zhJd; + + public String getZhJd() { + return zhJd; + } + + public void setZhJd(String zhJd) { + this.zhJd = zhJd; + } + public String getNewRxCssj() { return newRxCssj; } @@ -147,7 +169,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ condition=condition.and("isSync", isSync, MongoOper.IS); } - if(null != ycRxajc ){ + if(StringUtils.isNotEmpty(ycRxajc) ){ if("sz".equals(ycRxajc)){ condition=condition.and("ycRxajc.sz", true, MongoOper.IS); }else if("cs".equals(ycRxajc)){ @@ -156,34 +178,34 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ condition=condition.and("ycRxajc.xx", true, MongoOper.IS); } } - if(null != rxPgz ){ + if(StringUtils.isNotEmpty(rxPgz) ){ condition=condition.and("rxPgz.select", rxPgz, MongoOper.IS); } - if(null != rxlPgy ){ + if(StringUtils.isNotEmpty(rxlPgy ) ){ condition=condition.and("rxlPgy.select", rxlPgy, MongoOper.IS); } - if(null != provinceId){ + if(StringUtils.isNotEmpty(provinceId)){ condition=condition.and("provinceId", provinceId, MongoOper.IS); } - if(null != cityId){ + if(StringUtils.isNotEmpty(cityId)){ condition=condition.and("cityId", cityId, MongoOper.IS); } - if(null != areaId){ + if(StringUtils.isNotEmpty( areaId)){ condition=condition.and("areaId", areaId, MongoOper.IS); } - if(null != streetId){ + if(StringUtils.isNotEmpty( streetId)){ condition=condition.and("streetId", streetId, MongoOper.IS); } - if(null != hospitalId){ + if(StringUtils.isNotEmpty( hospitalId)){ condition=condition.and("hospitalId", hospitalId, MongoOper.IS); } - if(null != residentId){ + if(StringUtils.isNotEmpty(residentId)){ condition=condition.and("residentId", residentId, MongoOper.IS); } - if(null != residentIds){ + if(CollectionUtils.isNotEmpty(residentIds)){ condition=condition.and("residentId", residentIds, MongoOper.IN); } if(StringUtils.isNotEmpty(rxlYyz) ){ @@ -210,9 +232,19 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ if(null!=breastAbnormity){ condition=condition.and("breastAbnormity", breastAbnormity, MongoOper.IS); } - if(null!=newRxCssj){ + if(StringUtils.isNotEmpty(newRxCssj)){ condition=condition.and("newRxCssj", newRxCssj, MongoOper.IS); } + if(StringUtils.isNotEmpty(rxXJc)){ + condition=condition.and("rxXJc", rxXJc, MongoOper.IS); + } + if(StringUtils.isNotEmpty(zhJd)){ + if(zhJd.equals("0")){ + condition=condition.and("zhJd.yn", "0", MongoOper.IS); + }else { + condition=condition.and("zhJd.yc", zhJd, MongoOper.IN); + } + } Criteria c = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index de3ed7a..f27e634 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -104,6 +104,10 @@ public class CancerScreeningFacade { query.setBreastAbnormity(queryRequest.getBreastAbnormity()); //超声所见 query.setNewRxCssj(queryRequest.getNewRxCssj()); + //隆化乳腺X钼靶检查 + query.setRxXJc(queryRequest.getRxXJc()); + //最后诊断 内容字段 yn(0未见异常,1异常);yc(异常项1-9) + query.setZhJd(queryRequest.getZhJd()); List list = new ArrayList(); //System.out.println(query.convertToQuery().convertToMongoQuery()); List modelList = cancerScreenService.queryCancerScreList(query); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java index 498de8e..c9118b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.request; +import java.util.Map; + /** * @auther yangfei * @createTime 2017年09月15日 09时49分 @@ -62,6 +64,28 @@ public class CancerScreeningRequest extends BasePageQueryRequest { */ private String newRxCssj; + //隆化乳腺X钼靶检查内容,展示用到enum(LhBreastXRayContent) + private String rxXJc; + + public String getRxXJc() { + return rxXJc; + } + + public void setRxXJc(String rxXJc) { + this.rxXJc = rxXJc; + } + + //最后诊断 筛选(0未见异常,1-9异常) + private String zhJd; + + public String getZhJd() { + return zhJd; + } + + public void setZhJd(String zhJd) { + this.zhJd = zhJd; + } + public String getNewRxCssj() { return newRxCssj; } -- 1.8.3.1