diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWayQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWayQuery.java index cee2f60..e8150ef 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWayQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWayQuery.java @@ -3,6 +3,7 @@ package com.lyms.platform.permission.model; public class ProjectWayQuery { private String week; private Integer hospitalId; + private Integer type; public String getWeek() { return week; @@ -19,4 +20,12 @@ public class ProjectWayQuery { public void setHospitalId(Integer hospitalId) { this.hospitalId = hospitalId; } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java index 96189ac..f42fe21 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java @@ -134,12 +134,16 @@ public class FactorProjectController extends BaseController { @RequestBody ProjectWayQuery projectWayQuery) { Integer hospitalId= projectWayQuery.getHospitalId(); String week= projectWayQuery.getWeek(); + Integer type= projectWayQuery.getType(); if (hospitalId == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); } if (StringUtils.isEmpty(week)) { ResultUtils.buildParameterErrorResultAndWrite(response, "孕周不能为空"); } + if (type!=null){ + week=ProjectWeekEnums.getWeekName(week); + } FactorProjectEntity factorProject= factorProjectService.selectByWeek(hospitalId,week); ResultUtils.buildSuccessResultAndWrite(response,factorProject); }