Commit dc6ea97ac49ebbd63877b85059cca6a5eee18d4d

Authored by zhangchao
1 parent e3ea6c26fa
Exists in luanping and in 1 other branch dev

#优化检查项根据孕周查询条件

Showing 2 changed files with 13 additions and 0 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWayQuery.java View file @ dc6ea97
... ... @@ -3,6 +3,7 @@
3 3 public class ProjectWayQuery {
4 4 private String week;
5 5 private Integer hospitalId;
  6 + private Integer type;
6 7  
7 8 public String getWeek() {
8 9 return week;
... ... @@ -18,6 +19,14 @@
18 19  
19 20 public void setHospitalId(Integer hospitalId) {
20 21 this.hospitalId = hospitalId;
  22 + }
  23 +
  24 + public Integer getType() {
  25 + return type;
  26 + }
  27 +
  28 + public void setType(Integer type) {
  29 + this.type = type;
21 30 }
22 31 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java View file @ dc6ea97
... ... @@ -134,11 +134,15 @@
134 134 @RequestBody ProjectWayQuery projectWayQuery) {
135 135 Integer hospitalId= projectWayQuery.getHospitalId();
136 136 String week= projectWayQuery.getWeek();
  137 + Integer type= projectWayQuery.getType();
137 138 if (hospitalId == null) {
138 139 ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空");
139 140 }
140 141 if (StringUtils.isEmpty(week)) {
141 142 ResultUtils.buildParameterErrorResultAndWrite(response, "孕周不能为空");
  143 + }
  144 + if (type!=null){
  145 + week=ProjectWeekEnums.getWeekName(week);
142 146 }
143 147 FactorProjectEntity factorProject= factorProjectService.selectByWeek(hospitalId,week);
144 148 ResultUtils.buildSuccessResultAndWrite(response,factorProject);