From dc6ea97ac49ebbd63877b85059cca6a5eee18d4d Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Tue, 20 Feb 2024 16:13:27 +0800
Subject: [PATCH] =?UTF-8?q?#=E4=BC=98=E5=8C=96=E6=A3=80=E6=9F=A5=E9=A1=B9?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AD=95=E5=91=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/permission/model/ProjectWayQuery.java | 9 +++++++++
 .../platform/operate/web/controller/FactorProjectController.java | 4 ++++
 2 files changed, 13 insertions(+)

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);
     }
-- 
1.8.3.1