From 9e1f35b0826fd56a1f99773cf6d8085b0281a91f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 31 Jan 2018 14:49:22 +0800 Subject: [PATCH] 1 --- .../com/lyms/platform/query/PatientsQuery.java | 142 ++++++++++----------- .../platform/operate/web/facade/PatientFacade.java | 1 + .../operate/web/facade/RiskReportFacade.java | 2 +- 3 files changed, 72 insertions(+), 73 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 686c71e..2354150 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -101,7 +101,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Date lastCTimeStart; private Date lastCTimeEnd; private Integer postViewTimes; - private boolean gtePostTimes=false; + private boolean gtePostTimes = false; //户籍地 private String provinceRegisterId; private String cityRegisterId; @@ -117,9 +117,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private List hospitalList; //0 隐藏 1 显示 - private String enable="1"; + private String enable = "1"; private String notEnable; + private String notoRiskFactor; private Boolean extEnable; //区域来源 @@ -136,6 +137,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer buildDaysStart; private Integer buildDaysEnd; + public String getNotoRiskFactor() { + return notoRiskFactor; + } + + public void setNotoRiskFactor(String notoRiskFactor) { + this.notoRiskFactor = notoRiskFactor; + } + public Integer getBuildDaysStart() { return buildDaysStart; } @@ -381,7 +390,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String cardNo; - private Date birth; /** * 就诊卡号 @@ -487,7 +495,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private List bookbuildingDoctorList; //档案编号 - private String fileCode; + private String fileCode; // 分娩相关信息 // 分娩医院 private String fmHospital; @@ -1054,13 +1062,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS); MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN); condition = condition.orCondition(new MongoCondition[]{condition1, condition2}); - } - else if (null != smsBuildTypeList) - { + } else if (null != smsBuildTypeList) { condition = condition.and("buildType", smsBuildTypeList, MongoOper.IN); } - if(null!=extEnable){ - List list=new ArrayList(); + if (null != extEnable) { + List list = new ArrayList(); list.add("1"); list.add("2"); condition = condition.and("enable", list, MongoOper.NIN); @@ -1070,11 +1076,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("buildType", buildTypeEq, MongoOper.IS); } - if(buildTypeNot!=-1){ + if (buildTypeNot != -1) { condition = condition.and("buildType", buildTypeNot, MongoOper.NE); } - if(pcerteTypeId != null){ + if (pcerteTypeId != null) { condition = condition.and("pcerteTypeId", pcerteTypeId, MongoOper.IS); } @@ -1100,26 +1106,26 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(areaId)) { condition = condition.and("areaId", areaId, MongoOper.IS); } - if(StringUtils.isNotEmpty(cityId)){ + if (StringUtils.isNotEmpty(cityId)) { condition = condition.and("cityId", cityId, MongoOper.IS); } - if(StringUtils.isNotEmpty(provinceId)){ + if (StringUtils.isNotEmpty(provinceId)) { condition = condition.and("provinceId", provinceId, MongoOper.IS); } - if(StringUtils.isNotEmpty(streetId)){ + if (StringUtils.isNotEmpty(streetId)) { condition = condition.and("streetId", streetId, MongoOper.IS); } //户籍地 - if(StringUtils.isNotEmpty(provinceRegisterId)){ + if (StringUtils.isNotEmpty(provinceRegisterId)) { condition = condition.and("provinceRegisterId", provinceRegisterId, MongoOper.IS); } - if(StringUtils.isNotEmpty(cityRegisterId)){ + if (StringUtils.isNotEmpty(cityRegisterId)) { condition = condition.and("cityRegisterId", cityRegisterId, MongoOper.IS); } - if(StringUtils.isNotEmpty(areaRegisterId)){ + if (StringUtils.isNotEmpty(areaRegisterId)) { condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS); } - if(StringUtils.isNotEmpty(streetRegisterId)){ + if (StringUtils.isNotEmpty(streetRegisterId)) { condition = condition.and("streetRegisterId", streetRegisterId, MongoOper.IS); } @@ -1139,8 +1145,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private List hospitalList;*/ - - if (StringUtils.isNotEmpty(id)) { condition = condition.and("id", id, MongoOper.IS); } @@ -1169,7 +1173,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } else if (null != likeName) { condition = condition.and("username", likeName, MongoOper.LIKE); } - if(CollectionUtils.isNotEmpty(hospitalList)){ + if (CollectionUtils.isNotEmpty(hospitalList)) { condition = condition.and("hospitalId", hospitalList, MongoOper.IN); } if (null != hospitalId) { @@ -1185,24 +1189,24 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != queryNo) { MongoCondition c = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("username", "^" + queryNo, MongoOper.LIKE); MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS); MongoCondition con5 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS); - if(c1!=null) { - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria()); - }else { - c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4,con5}).getCriteria(); + if (c1 != null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria()); + } else { + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3, con4, con5}).getCriteria(); } } if (null != phoneOrCert) { MongoCondition c = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrCert, MongoOper.IS); + MongoCondition con1 = MongoCondition.newInstance("phone", phoneOrCert, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("cardNo", phoneOrCert, MongoOper.IS); - if(c1!=null) { + if (c1 != null) { c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); - }else { + } else { c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); } } @@ -1210,33 +1214,28 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != pc) { MongoCondition c = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("phone", pc[0], MongoOper.IS); + MongoCondition con1 = MongoCondition.newInstance("phone", pc[0], MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("cardNo", pc[1], MongoOper.IS); - if(c1!=null) { + if (c1 != null) { c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); - }else { + } else { c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); } } if (null != pv) { - if (StringUtils.isNotEmpty(pv[0]) && StringUtils.isNotEmpty(pv[1]) && StringUtils.isNotEmpty(pv[2])) - { + if (StringUtils.isNotEmpty(pv[0]) && StringUtils.isNotEmpty(pv[1]) && StringUtils.isNotEmpty(pv[2])) { MongoCondition con1 = MongoCondition.newInstance("phone", pv[0], MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("vcCardNo", pv[1], MongoOper.IS); MongoCondition con3 = MongoCondition.newInstance("cardNo", pv[2], MongoOper.IS); - condition = condition.orCondition(new MongoCondition[]{con1, con2,con3}); - } - else - { + condition = condition.orCondition(new MongoCondition[]{con1, con2, con3}); + } else { if (StringUtils.isNotEmpty(pv[1])) { condition = condition.and("vcCardNo", pv[1], MongoOper.IS); - } - else if (StringUtils.isNotEmpty(pv[2])) { + } else if (StringUtils.isNotEmpty(pv[2])) { condition = condition.and("cardNo", pv[2], MongoOper.IS); - } - else if (StringUtils.isNotEmpty(pv[0])) { + } else if (StringUtils.isNotEmpty(pv[0])) { condition = condition.and("phone", pv[0], MongoOper.IS); } } @@ -1244,11 +1243,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (CollectionUtils.isNotEmpty(fmHospitalQueryList)) { MongoCondition c = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("hospitalId", fmHospitalQueryList, MongoOper.IN); + MongoCondition con1 = MongoCondition.newInstance("hospitalId", fmHospitalQueryList, MongoOper.IN); MongoCondition con2 = MongoCondition.newInstance("fmHospital", fmHospitalQueryList, MongoOper.IN); - if(c1!=null) { + if (c1 != null) { c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); - }else{ + } else { c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); } } @@ -1259,21 +1258,20 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (lastCheckEmployeeId != null) { condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS); - } - else if(lastCheckEId){ + } else if (lastCheckEId) { condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE); MongoCondition c = MongoCondition.newInstance(); - if(c1!=null){ - c1= c1.andOperator(c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria()); - }else { + if (c1 != null) { + c1 = c1.andOperator(c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria()); + } else { c1 = c.andCondition(MongoCondition.newInstance("lastCheckEmployeeId", null, MongoOper.NE)).getCriteria(); } } if (fmDateStart != null && fmDateEnd != null) { - if(c1!=null){ + if (c1 != null) { c1 = c1.and("fmDate").gte(fmDateStart).lte(fmDateEnd); - }else { + } else { c1 = Criteria.where("fmDate").gte(fmDateStart).lte(fmDateEnd); } } @@ -1281,7 +1279,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != serviceType) { condition = condition.and("serviceType", serviceType, MongoOper.IS); } - if(null!=source){ + if (null != source) { condition = condition.and("source", source, MongoOper.IS); } @@ -1311,16 +1309,15 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(rFactor)) { condition = condition.and("riskFactorId", rFactor, MongoOper.IN); - } - else if(norFactor){ - condition = condition.and("riskFactorId", new ArrayList(), MongoOper.NE); + } else if (norFactor) { + condition = condition.and("riskFactorId", new ArrayList(), MongoOper.NE); MongoCondition c = MongoCondition.newInstance(); - if(c1!=null){ + if (c1 != null) { c1 = c1.andOperator(c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria()); - }else { + } else { c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria(); } - }else if(null!=rFactorList &&!rFactorList.isEmpty()){ + } else if (null != rFactorList && !rFactorList.isEmpty()) { condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); } if (-1 != yn) { @@ -1336,13 +1333,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (type != null && -1 != type) { condition = condition.and("type", type, MongoOper.IS); } - if(typeList!=null&&typeList.size()>0){ - condition = condition.and("type",typeList,MongoOper.IN); + if (typeList != null && typeList.size() > 0) { + condition = condition.and("type", typeList, MongoOper.IN); } - if(null!=postViewTimes){ - if(gtePostTimes){ + if (null != postViewTimes) { + if (gtePostTimes) { condition = condition.and("postViewTimes", postViewTimes, MongoOper.GTE); - }else{ + } else { condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS); } } @@ -1448,12 +1445,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } } if (null != gteModified && null != gteCreated) { - MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); + MongoCondition mongoCondition = new MongoCondition("modified", gteModified, MongoOper.GTE); MongoCondition condition2 = new MongoCondition("created", gteCreated, MongoOper.GTE); condition = condition.orCondition(new MongoCondition[]{mongoCondition, condition2}); } - if(null != lastCTimeStart){ + if (null != lastCTimeStart) { if (null != c1) { c1 = c1.and("lastCTime").gte(lastCTimeStart); } else { @@ -1507,7 +1504,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } boolean isBirthStart = false; if (null != birthStart) { - isBirthStart = true; + isBirthStart = true; if (null != c1) { c1 = c1.and("birth").gte(birthStart); } else { @@ -1517,12 +1514,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != birthEnd) { if (null != c1) { - if (isBirthStart) - { + if (isBirthStart) { c1 = c1.lte(birthEnd); - } - else - { + } else { c1 = c1.and("birth").lte(birthEnd); } @@ -1578,6 +1572,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { c1 = Criteria.where("oRiskFactor").exists(true); } } + if (null != notEnable) { + condition = condition.and("oRiskFactor", notEnable, MongoOper.NE); + } if (null != c1) { @@ -1587,6 +1584,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { return condition.toMongoQuery(); } + public Integer gethScoreEnd() { return hScoreEnd; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 14a5ed2..85b873f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -254,6 +254,7 @@ public class PatientFacade { //高危统计中的自定义高危 if ("otherRiskId".equals(riskPatientsQueryRequest.getrFacotr())) { + patientsQuery.setNotoRiskFactor(""); patientsQuery.setoRiskFactor("true"); } else { patientsQuery.setrFactorList(com.lyms.platform.common.utils.StringUtils.covertToList(riskPatientsQueryRequest.getrFacotr(), String.class)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index f8ed353..a997a6b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -152,8 +152,8 @@ public class RiskReportFacade { query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart()); query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd()); + query.setNotoRiskFactor(""); query.setoRiskFactor("true"); - query.setType(patientsQuery.getType()); //单个高危因素孕产妇条数 -- 1.8.3.1