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 d34317a..6dc018f 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 @@ -159,7 +159,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { /** * 高危评分 */ - private Integer hScore; + private Integer hScoreStart; + + /** + * 高危评分 + */ + private Integer hScoreEnd; /** * 高危因素 */ @@ -373,13 +378,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { this.areaIdOrRestId = areaIdOrRestId; } - public Integer gethScore() { - return hScore; - } - - public void sethScore(Integer hScore) { - this.hScore = hScore; - } public String getrFactor() { return rFactor; @@ -528,11 +526,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != created) { condition = condition.and("created", created, MongoOper.LTE); } - if (null != hScore) { - condition = condition.and("riskScore", hScore, MongoOper.IS); - }else if (null != isHighRisk) { - condition = condition.and("riskScore", 0, MongoOper.GT); - } + if (StringUtils.isNotEmpty( rLevel)) { condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); @@ -624,8 +618,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (-1 != type) { condition = condition.and("type", type, MongoOper.IS); } - boolean isAddStart = Boolean.FALSE; + Criteria c = null; if (null != lastMensesStart) { c = Criteria.where("lastMenses").gte(lastMensesStart); @@ -641,6 +635,25 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } + if (null != hScoreStart) { +// condition = condition.and("riskScore", hScore, MongoOper.IS); + + if (null != hScoreStart) { + c = Criteria.where("riskScore").gte(hScoreStart); + isAddStart = Boolean.TRUE; + } + if (null != hScoreEnd) { + if (isAddStart) { + c = c.lte(hScoreEnd); + } else { + c = Criteria.where("riskScore").lte(hScoreEnd); + } + isAddStart = Boolean.TRUE; + } + }else if (null != isHighRisk) { + condition = condition.and("riskScore", 0, MongoOper.GT); + } + if (null != bookbuildingDateStart) { c = Criteria.where("bookbuildingDate").gte(bookbuildingDateStart); isAddStart = Boolean.TRUE; @@ -694,6 +707,21 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { return condition.toMongoQuery(); } + public Integer gethScoreEnd() { + return hScoreEnd; + } + + public void sethScoreEnd(Integer hScoreEnd) { + this.hScoreEnd = hScoreEnd; + } + + public Integer gethScoreStart() { + return hScoreStart; + } + + public void sethScoreStart(Integer hScoreStart) { + this.hScoreStart = hScoreStart; + } public Date getBirth() { return birth; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index fc8b51f..21c7db8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -102,7 +102,7 @@ public class AntenatalExaminationFacade { //修改孕妇高危等级 // updatePatientRiskLevel(model, patients); - + updateLastRisk(antExAddRequest.getParentId()); if (null != patients.getBuildType() && patients.getBuildType() == 3) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(patients.getId()); 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 9afcea3..d796012 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 @@ -200,7 +200,8 @@ public class PatientFacade { //设置为孕妇 patientsQuery.setType(type); patientsQuery.setLikeName(riskPatientsQueryRequest.getName()); - patientsQuery.sethScore(riskPatientsQueryRequest.gethScore()); + patientsQuery.sethScoreStart(riskPatientsQueryRequest.getStrtHScore()); + patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore()); patientsQuery.setrFactor(riskPatientsQueryRequest.getrFactor()); Date currentDate = DateUtil.formatDate(new Date()); if (null != riskPatientsQueryRequest.getServiceType()) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 9f3bb45..700f9d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -43,7 +43,9 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { private String rLevel; //高危评分 @FormParam - private Integer hScore; + private Integer endHScore; + + private Integer strtHScore; //风险因素 @FormParam private String rFactor; @@ -60,6 +62,22 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { @FormParam private Integer expVip; + public Integer getEndHScore() { + return endHScore; + } + + public void setEndHScore(Integer endHScore) { + this.endHScore = endHScore; + } + + public Integer getStrtHScore() { + return strtHScore; + } + + public void setStrtHScore(Integer strtHScore) { + this.strtHScore = strtHScore; + } + public Integer getEndChsj() { return endChsj; } @@ -142,9 +160,6 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { this.startAge = startAge; } - public void sethScore(Integer hScore) { - this.hScore = hScore; - } public Integer getServiceStatus() { return serviceStatus; @@ -155,10 +170,6 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { } - public Integer gethScore() { - return hScore; - } - public String getCardNo() { return cardNo; }