From 08e3705618f7a40def4cb18a8e06298ccef2b050 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 19 Oct 2021 14:16:21 +0800 Subject: [PATCH] =?UTF-8?q?//=E7=A7=A6=E7=9A=87=E5=B2=9B-=E5=87=BA?= =?UTF-8?q?=E9=99=A2=E8=AF=8A=E6=96=AD=E6=A8=A1=E5=9D=97=E6=95=B4=E5=90=88?= =?UTF-8?q?(=E4=BD=8F=E9=99=A2=E5=8F=B7=EF=BC=8C=E4=BD=8F=E9=99=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E5=87=BA=E9=99=A2=E8=AF=8A=E6=96=AD?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/BabyHighRiskBabyModel.java | 15 +++++++++ .../java/com/lyms/platform/pojo/BabyModel.java | 15 +++++++++ .../platform/query/BabyHighRiskBabyModelQuery.java | 39 ++++++++++++++++------ .../operate/web/facade/BabyHighRiskBabyFacade.java | 3 ++ .../web/request/BabyHighRiskBabyRequest.java | 15 +++++++++ .../operate/web/result/BabyHighRiskBabyResult.java | 17 ++++++++++ 6 files changed, 94 insertions(+), 10 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java index 9418475..7a3f1cb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java @@ -224,6 +224,21 @@ public class BabyHighRiskBabyModel extends BaseModel { private String auxiliaryExamin;//辅助检查 + /** + * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断) + */ + //出院诊断list + private List> cyzdList; + + public List> getCyzdList() { + return cyzdList; + } + + public void setCyzdList(List> cyzdList) { + this.cyzdList = cyzdList; + } + /***********************************************************/ + public String getParentAssess() { return parentAssess; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 351b264..a5b4899 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -721,6 +721,21 @@ public class BabyModel extends BaseModel { } /***********************************************************/ + /** + * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断) + */ + //出院诊断list + private List> cyzdList; + + public List> getCyzdList() { + return cyzdList; + } + + public void setCyzdList(List> cyzdList) { + this.cyzdList = cyzdList; + } + /***********************************************************/ + public Integer getDeafnessGene() { return deafnessGene; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java index f314ba6..e375e40 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java @@ -384,13 +384,13 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN condition = condition.and("number", number, MongoOper.IS); } //秦皇岛新模块区分参数（0:不包含4个类别，1:只查4个类别） - if(CollectionUtils.isNotEmpty(cyzd)){ - if(classify==1){ - condition=condition.and("cyzd", cyzd, MongoOper.IN); - }else { - condition=condition.and("cyzd", cyzd, MongoOper.NIN); - } - } +// if(CollectionUtils.isNotEmpty(cyzd)){ +// if(classify==1){ +// condition=condition.and("cyzd", cyzd, MongoOper.IN); +// }else { +// condition=condition.and("cyzd", cyzd, MongoOper.NIN); +// } +// } Criteria c = null; //月龄 /*if (null != monthStart) { @@ -495,11 +495,30 @@ public class BabyHighRiskBabyModelQuery extends BaseQuery implements IConvertToN c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); } } - if (c != null) { - return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + //秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断) + Criteria cor=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 + if(CollectionUtils.isNotEmpty(cyzd)){ + if(classify==1){ + MongoCondition con = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("cyzd", cyzd, MongoOper.IN); + MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.IN); + cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + }else { + MongoCondition con = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("cyzd", cyzd, MongoOper.NIN); + MongoCondition con2 = MongoCondition.newInstance("cyzdList.cyzd", cyzd, MongoOper.NIN); + cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + } + } + + /** + * 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题 + */ + if(c!=null){ + return new MongoCondition(c.andOperator(condition.getCriteria(),cor)).toMongoQuery(); } + return new MongoCondition(cor.andOperator(condition.getCriteria())).toMongoQuery(); - return condition.toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index 71ea9f6..7703efb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BabyHighRiskBabyRequest; @@ -187,6 +188,8 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { model.setParentAssess(request.getParentAssess()); model.setAuxiliaryExamin(request.getAuxiliaryExamin()); + //秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断) + model.setCyzdList(request.getCyzdList()); return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java index 45cf449..d459f7e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java @@ -238,6 +238,21 @@ public class BabyHighRiskBabyRequest { private String auxiliaryExamin;//辅助检查 + /** + * 秦皇岛-出院诊断模块整合(住院号，住院时间，出院诊断) + */ + //出院诊断list + private List> cyzdList; + + public List> getCyzdList() { + return cyzdList; + } + + public void setCyzdList(List> cyzdList) { + this.cyzdList = cyzdList; + } + /***********************************************************/ + public String getParentAssess() { return parentAssess; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java index 6479592..45bdb9e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java @@ -246,6 +246,21 @@ public class BabyHighRiskBabyResult implements IBasicResultConvert + private List> cyzdList; + + public List> getCyzdList() { + return cyzdList; + } + + public void setCyzdList(List> cyzdList) { + this.cyzdList = cyzdList; + } + /***********************************************************/ + public List getEvalMethod() { return evalMethod; } @@ -1138,6 +1153,8 @@ public class BabyHighRiskBabyResult implements IBasicResultConvert