diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java
index f5182e5..3799e58 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWeekMapper.java
@@ -4,6 +4,7 @@ import com.lyms.platform.permission.model.ProjectWeekEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ProjectWeekMapper {
     List<ProjectWeekEntity> getList(@Param("hospitalId")Integer hospitalId,@Param("type")Integer type);
@@ -11,5 +12,5 @@ public interface ProjectWeekMapper {
     void update(ProjectWeekEntity factorProject);
     void del(Integer id);
     ProjectWeekEntity selectById(Integer id);
-    String selectByWeek(@Param("hospitalId") Integer hospitalId, @Param("week")String week,@Param("type")Integer type);
+    List<Map> selectByWeek(@Param("hospitalId") Integer hospitalId, @Param("week")String week, @Param("type")Integer type);
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java
index 08fd8b4..60c41bd 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWeekService.java
@@ -3,11 +3,12 @@ package com.lyms.platform.permission.service;
 import com.lyms.platform.permission.model.ProjectWeekEntity;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ProjectWeekService {
     List<ProjectWeekEntity> getList(Integer hospitalId,Integer type);
     ProjectWeekEntity selectInfo(Integer id);
-    String selectByWeek(Integer hospitalId,String week,Integer type);
+    List<Map> selectByWeek(Integer hospitalId, String week, Integer type);
     void add(ProjectWeekEntity projectWay);
     void update(ProjectWeekEntity projectWay);
     void del(Integer id);
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java
index 820014c..c0a0850 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWeekServiceImpl.java
@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service("projectWeekService")
 public class ProjectWeekServiceImpl implements ProjectWeekService {
@@ -23,7 +24,7 @@ public class ProjectWeekServiceImpl implements ProjectWeekService {
     }
 
     @Override
-    public String selectByWeek(Integer hospitalId,String week,Integer type) {
+    public List<Map> selectByWeek(Integer hospitalId,String week,Integer type) {
         return projectWeekMapper.selectByWeek(hospitalId,week,type);
     }
 
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml
index 1ec0bc9..1ffd0a7 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWeekMapper.xml
@@ -59,9 +59,9 @@
         id = #{id,jdbcType=INTEGER}
     </select>
 
-    <select id="selectByWeek" resultType="java.lang.String">
+    <select id="selectByWeek" resultType="java.util.Map" parameterType="java.util.List">
         SELECT
-	`name`
+	`name`,week
 FROM
 	project_week
 WHERE
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 f1ab891..0243873 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
@@ -7,6 +7,7 @@ import com.lyms.platform.common.utils.ResultUtils;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.operate.web.facade.BookbuildingFacade;
 import com.lyms.platform.operate.web.result.FrontEndResult;
+import com.lyms.platform.operate.web.utils.CollectionUtils;
 import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.CheckItemService;
 import com.lyms.platform.permission.service.FactorProjectService;
@@ -17,8 +18,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Controller
 @RequestMapping("/factorProject")
@@ -150,7 +150,22 @@ public class FactorProjectController extends BaseController {
         }
         //用于区分是小程序通过推送跳转还是自查询
         if (type!=null){
-            week=projectWeekService.selectByWeek(hospitalId,week,weekType);
+            List<Map> list= projectWeekService.selectByWeek(hospitalId,week,weekType);
+            if (CollectionUtils.isNotEmpty(list)){
+                Set<String> weekSet=new HashSet<>();
+                weekSet.add(week);
+                for (Map<String,String> params:list){
+                    String weeks= params.get("week");
+                    Set<String> set=new HashSet<>(Arrays.asList(weeks.split(",")));
+                    weekSet.retainAll(set);
+                    if (weekSet.size()>0){
+                        week=params.get("name");
+                        break;
+                    }else {
+                        weekSet.add(week);
+                    }
+                }
+            }
         }
         FactorProjectEntity factorProject= factorProjectService.selectByWeek(hospitalId,week,weekType);
         ResultUtils.buildSuccessResultAndWrite(response,factorProject);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index f6b8792..b4d0c06 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1750,7 +1750,22 @@ public class BookbuildingFacade {
                     dueWeek = "";
                 } else {
                     String week = days / 7 + "";
-                    dueWeek = projectWeekService.selectByWeek(hospitalId, week, 10001);
+                    List<Map> list= projectWeekService.selectByWeek(hospitalId, week, 10001);
+                    if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(list)){
+                        Set<String> weekSet=new HashSet<>();
+                        weekSet.add(week);
+                        for (Map<String,String> map:list){
+                            String weeks= map.get("week");
+                            Set<String> set=new HashSet<>(Arrays.asList(weeks.split(",")));
+                            weekSet.retainAll(set);
+                            if (weekSet.size()>0){
+                                dueWeek=map.get("name");
+                                break;
+                            }else {
+                                weekSet.add(week);
+                            }
+                        }
+                    }
                     params.put("dueWeek", dueWeek);
 
                     int day = (days % 7);