diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index de05eaa..a45205d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -140,6 +140,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //高危ID private String highRiskInfo; + private String diagnosehighRiskInfo; //体弱ID private String weakSonInfo; @@ -1028,6 +1029,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (!StringUtils.isEmpty(lastDiagnose)) { condition = condition.and("lastDiagnose", lastDiagnose, MongoOper.IN); } + if (!StringUtils.isEmpty(diagnosehighRiskInfo)) { + condition = condition.and("diagnose", diagnosehighRiskInfo, MongoOper.IS); + } + if (!StringUtils.isEmpty(highRiskInfo)) { condition = condition.and("highRiskInfo", highRiskInfo, MongoOper.IN); @@ -1348,6 +1353,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.nextDateStart = nextDateStart; } + public String getDiagnosehighRiskInfo() { + return diagnosehighRiskInfo; + } + + public void setDiagnosehighRiskInfo(String diagnosehighRiskInfo) { + this.diagnosehighRiskInfo = diagnosehighRiskInfo; + } + public Date getNextDateEnd() { return nextDateEnd; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 3e548a2..3d0438a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -220,6 +220,7 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "name", required = false) String name, @RequestParam(value = "highRiskType", required = false) Integer highRiskType, @RequestParam(value = "diagnose", required = false) String diagnose, + @RequestParam(value = "diagnosehighRiskInfo", required = false) String diagnosehighRiskInfo, @RequestParam(value = "dateRange", required = false) String dateRange, @RequestParam(value = "highRiskInfos", required = false) List highRiskInfos, @RequestParam(value = "weakSonInfos", required = false) List weakSonInfos, @@ -257,6 +258,7 @@ public class BabyBuildController extends BaseController { request.setVcCardNo(vcCardNo); request.setWeakSonInfos(weakSonInfos); request.setHighRiskInfos(highRiskInfos); + request.setDiagnosehighRiskInfo(diagnosehighRiskInfo); request.setShowDetail(showDetail); request.setBuildDoctor(buildDoctor); request.setQueryNo(queryNo); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index fee17bd..f7b3a0f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2194,6 +2194,7 @@ public class BabyBookbuildingFacade { babyQuery.setWeakSonInfo(request.getWeakSonInfo()); //高危儿详情 babyQuery.setHighRiskInfo(request.getHighRiskInfo()); + babyQuery.setDiagnosehighRiskInfo(request.getDiagnosehighRiskInfo()); //多项体弱儿因素查询条件 babyQuery.setWeakSonInfos(request.getWeakSonInfos()); //多项体弱儿因素查询 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 9c77450..2307039 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -46,6 +46,8 @@ public class BabyManageRequest extends BaseQuery { private String highRiskInfo; //高危儿多项 private List highRiskInfos; + //高危儿统计秦皇岛数据处理 + private String diagnosehighRiskInfo; //体弱儿多项 private List weakSonInfos; //建档医生id @@ -422,4 +424,13 @@ public class BabyManageRequest extends BaseQuery { public void setHospitalId(String hospitalId) { this.hospitalId = hospitalId; } + + + public String getDiagnosehighRiskInfo() { + return diagnosehighRiskInfo; + } + + public void setDiagnosehighRiskInfo(String diagnosehighRiskInfo) { + this.diagnosehighRiskInfo = diagnosehighRiskInfo; + } }