From 888312130d9a34351233104fe30c7e6c0bb53144 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Fri, 2 Feb 2024 11:30:23 +0800 Subject: [PATCH] =?UTF-8?q?#=E4=BC=98=E5=8C=96=E7=A7=A6=E7=9A=87=E5=B2=9B?= =?UTF-8?q?=E4=BA=8C=E9=99=A2=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=AD=A5=E9=AA=A4=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/FactorProjectMapper.java | 3 + .../permission/dao/master/ProjectWayMapper.java | 14 +++ .../platform/permission/model/FactorProject.java | 22 ++-- .../permission/model/FactorProjectEntity.java | 21 +++- .../permission/model/FactorProjectManage.java | 1 - .../lyms/platform/permission/model/ProjectWay.java | 58 +++++++++ .../platform/permission/model/ProjectWayQuery.java | 22 ++++ .../permission/service/CheckItemService.java | 2 +- .../permission/service/FactorProjectService.java | 5 +- .../permission/service/ProjectWayService.java | 14 +++ .../service/impl/CheckItemServiceImpl.java | 13 ++- .../service/impl/FactorProjectServiceImpl.java | 130 ++++++++++++--------- .../service/impl/ProjectWayServiceImpl.java | 45 +++++++ .../mainOrm/master/FactorProjectMapper.xml | 79 ++++++++++--- .../resources/mainOrm/master/ProjectWayMapper.xml | 81 +++++++++++++ .../web/controller/FactorProjectController.java | 49 +++++--- .../operate/web/facade/BookbuildingFacade.java | 1 - 17 files changed, 450 insertions(+), 110 deletions(-) create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWay.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWayQuery.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java create mode 100644 platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FactorProjectMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FactorProjectMapper.java index 764685b..8e5e465 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FactorProjectMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FactorProjectMapper.java @@ -2,14 +2,17 @@ package com.lyms.platform.permission.dao.master; import com.lyms.platform.permission.model.FactorProject; import com.lyms.platform.permission.model.FactorProjectQuery; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface FactorProjectMapper { List getList(FactorProjectQuery factorProjectQuery); + List selectList(@Param("hospitalId")Integer hospitalId, @Param("week")String week); int queryFactorProjectCount(FactorProjectQuery factorProjectQuery); void add(FactorProject factorProject); void update(FactorProject factorProject); void del(Integer id); FactorProject selectById(Integer id); + FactorProject selectInfo(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java new file mode 100644 index 0000000..46f3bd7 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/ProjectWayMapper.java @@ -0,0 +1,14 @@ +package com.lyms.platform.permission.dao.master; + +import com.lyms.platform.permission.model.ProjectWay; + +import java.util.List; + +public interface ProjectWayMapper { + List getList(List ids); + void add(ProjectWay factorProject); + void update(ProjectWay factorProject); + void del(List ids); + ProjectWay selectById(Integer id); + void insertBatch(List list); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java index fd6e174..f93937a 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProject.java @@ -1,15 +1,19 @@ package com.lyms.platform.permission.model; +import org.springframework.data.annotation.Transient; + import java.util.Date; +import java.util.List; public class FactorProject { private Integer id; private String riskFactorIds; private String riskFactorName; - private String weekProjectId; private String week; private Integer hospitalId; private Date created; + @Transient + private List wayList; public Integer getId() { return id; @@ -35,14 +39,6 @@ public class FactorProject { this.riskFactorName = riskFactorName; } - public String getWeekProjectId() { - return weekProjectId; - } - - public void setWeekProjectId(String weekProjectId) { - this.weekProjectId = weekProjectId; - } - public String getWeek() { return week; } @@ -66,4 +62,12 @@ public class FactorProject { public void setCreated(Date created) { this.created = created; } + + public List getWayList() { + return wayList; + } + + public void setWayList(List wayList) { + this.wayList = wayList; + } } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java index 5c015e5..86febb3 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java @@ -3,9 +3,10 @@ package com.lyms.platform.permission.model; import java.util.List; public class FactorProjectEntity { + private List riskFactorNames; private String week; - private List healthItemList; - private List riskItemList; + private List healthItemList; + private List riskItemList; public String getWeek() { return week; @@ -15,19 +16,27 @@ public class FactorProjectEntity { this.week = week; } - public List getHealthItemList() { + public List getHealthItemList() { return healthItemList; } - public void setHealthItemList(List healthItemList) { + public void setHealthItemList(List healthItemList) { this.healthItemList = healthItemList; } - public List getRiskItemList() { + public List getRiskItemList() { return riskItemList; } - public void setRiskItemList(List riskItemList) { + public void setRiskItemList(List riskItemList) { this.riskItemList = riskItemList; } + + public List getRiskFactorNames() { + return riskFactorNames; + } + + public void setRiskFactorNames(List riskFactorNames) { + this.riskFactorNames = riskFactorNames; + } } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectManage.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectManage.java index 43781b0..5af0a28 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectManage.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectManage.java @@ -1,6 +1,5 @@ package com.lyms.platform.permission.model; -import java.util.Date; import java.util.List; public class FactorProjectManage { diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWay.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWay.java new file mode 100644 index 0000000..bda6c3f --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWay.java @@ -0,0 +1,58 @@ +package com.lyms.platform.permission.model; + +public class ProjectWay { + private Integer id; + private String weekProjectId; + private String way; + private String weekProjectName; + private Integer factorId; + private Integer sort; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getWeekProjectId() { + return weekProjectId; + } + + public void setWeekProjectId(String weekProjectId) { + this.weekProjectId = weekProjectId; + } + + public String getWay() { + return way; + } + + public void setWay(String way) { + this.way = way; + } + + public Integer getSort() { + return sort; + } + + public void setSort(Integer sort) { + this.sort = sort; + } + + public String getWeekProjectName() { + return weekProjectName; + } + + public void setWeekProjectName(String weekProjectName) { + this.weekProjectName = weekProjectName; + } + + public Integer getFactorId() { + return factorId; + } + + public void setFactorId(Integer factorId) { + this.factorId = factorId; + } +} 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 new file mode 100644 index 0000000..cee2f60 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ProjectWayQuery.java @@ -0,0 +1,22 @@ +package com.lyms.platform.permission.model; + +public class ProjectWayQuery { + private String week; + private Integer hospitalId; + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public Integer getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Integer hospitalId) { + this.hospitalId = hospitalId; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java index 721f0c3..045c5ef 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java @@ -21,5 +21,5 @@ public interface CheckItemService { void deleteCheckItem(Integer id); - List selectByIds(List list); + List selectByIds(String[] list); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java index 6a1c06d..924055f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/FactorProjectService.java @@ -2,7 +2,6 @@ package com.lyms.platform.permission.service; import com.lyms.platform.permission.model.FactorProject; import com.lyms.platform.permission.model.FactorProjectEntity; -import com.lyms.platform.permission.model.FactorProjectManage; import com.lyms.platform.permission.model.FactorProjectQuery; import java.util.List; @@ -13,6 +12,6 @@ public interface FactorProjectService { void update(FactorProject factorProject); void del(Integer id); FactorProject selectById(Integer id); - FactorProjectManage selectInfo(Integer id); - FactorProjectEntity selectByWeek(FactorProjectQuery factorProjectQuery); + FactorProjectEntity selectByWeek(Integer hospitalId,String week); + FactorProject selectInfo(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java new file mode 100644 index 0000000..f805fc5 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/ProjectWayService.java @@ -0,0 +1,14 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.ProjectWay; + +import java.util.List; + +public interface ProjectWayService { + List getList(List ids); + void add(ProjectWay projectWay); + void update(ProjectWay projectWay); + void del(List ids); + void insertBatch(List list); + ProjectWay selectById(Integer id); +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java index b4346a9..a7f73bc 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java @@ -6,6 +6,7 @@ import com.lyms.platform.permission.service.CheckItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -37,8 +38,16 @@ public class CheckItemServiceImpl implements CheckItemService { } @Override - public List selectByIds(List list) { - return checkItemMapper.selectByIds(list); + public List selectByIds(String[] list) { + if (list.length>0){ + List ids=new ArrayList<>(); + for (int i = 0,j=list.length; i getList(FactorProjectQuery factorProjectQuery) { @@ -27,19 +31,62 @@ public class FactorProjectServiceImpl implements FactorProjectService { return factorProjectMapper.getList(factorProjectQuery); } + @Override public void add(FactorProject factorProject) { - factorProjectMapper.add(factorProject); + List wayList = factorProject.getWayList(); + if (CollectionUtils.isNotEmpty(wayList)) { + factorProjectMapper.add(factorProject); + Integer id=factorProject.getId(); + Collections.sort(wayList, new Comparator() { + @Override + public int compare(ProjectWay o1, ProjectWay o2) { + Integer result = o1.getSort() - o2.getSort(); + if (result < 0) { + return -1; + } else { + return 1; + } + } + }); + for (int i = 0, j = wayList.size(); i < j; i++) { + ProjectWay projectWay = wayList.get(i); + projectWay.setFactorId(id); + } + projectWayService.insertBatch(wayList); + } } @Override public void update(FactorProject factorProject) { - factorProjectMapper.update(factorProject); + List wayList = factorProject.getWayList(); + if (CollectionUtils.isNotEmpty(wayList)) { + for (int i = 0, j = wayList.size(); i < j; i++) { + ProjectWay projectWay = wayList.get(i); + if (projectWay.getId() != null) { + projectWayService.update(projectWay); + } + } + factorProjectMapper.update(factorProject); + } + } @Override public void del(Integer id) { - factorProjectMapper.del(id); + FactorProject factorProject= selectInfo(id); + if (factorProject!=null){ + List wayList= factorProject.getWayList(); + if (CollectionUtils.isNotEmpty(wayList)){ + List ids=new ArrayList<>(); + for (int i = 0,j=wayList.size(); i < j; i++) { + ProjectWay projectWay= wayList.get(i); + ids.add(projectWay.getId()); + } + projectWayService.del(ids); + factorProjectMapper.del(id); + } + } } @Override @@ -48,63 +95,36 @@ public class FactorProjectServiceImpl implements FactorProjectService { } @Override - public FactorProjectManage selectInfo(Integer id) { - FactorProject factorProject= factorProjectMapper.selectById(id); - if (factorProject!=null){ - FactorProjectManage factorProjectManage=new FactorProjectManage(); - factorProjectManage.setId(id); - factorProjectManage.setRiskFactorName(factorProject.getRiskFactorName()); - factorProjectManage.setWeek(factorProject.getWeek()); - String weekProjectIds= factorProject.getWeekProjectId(); - if (StringUtils.isNotEmpty(weekProjectIds)){ - String [] ids= weekProjectIds.split(","); - if (ids.length>0){ - List list=new ArrayList<>(); - for (int i = 0,j=ids.length; i < j ; i++) { - Integer projectId= Integer.valueOf(ids[i]); - list.add(projectId); - } - List checkItemList= checkItemService.selectByIds(list); - factorProjectManage.setCheckItemList(checkItemList); - } - } - return factorProjectManage; - } - return null; + public FactorProject selectInfo(Integer id) { + return factorProjectMapper.selectInfo(id); } @Override - public FactorProjectEntity selectByWeek(FactorProjectQuery factorProjectQuery) { - List projectList= factorProjectMapper.getList(factorProjectQuery); - if (CollectionUtils.isNotEmpty(projectList)){ - FactorProjectEntity factorProjectManage=new FactorProjectEntity(); - factorProjectManage.setWeek(factorProjectQuery.getWeek()); - List healthList = new ArrayList<>(); - List riskList = new ArrayList<>(); - for (int i = 0,j=projectList.size(); i < j; i++) { - FactorProject factorProject= projectList.get(i); - String weekProjectIds= factorProject.getWeekProjectId(); - String [] ids= weekProjectIds.split(","); - if (ids.length>0) { - if ("健康".equals(factorProject.getRiskFactorName())){ - for (int a = 0, b = ids.length; a < b; a++) { - Integer projectId = Integer.valueOf(ids[a]); - healthList.add(projectId); - } - }else { - for (int a = 0, b = ids.length; a < b; a++) { - Integer projectId = Integer.valueOf(ids[a]); - riskList.add(projectId); - } + public FactorProjectEntity selectByWeek(Integer hospitalId,String week) { + List projectList = factorProjectMapper.selectList(hospitalId,week); + if (CollectionUtils.isNotEmpty(projectList)) { + FactorProjectEntity factorProjectManage = new FactorProjectEntity(); + factorProjectManage.setWeek(week); + List healthList = new ArrayList<>(); + List riskList = new ArrayList<>(); + List riskFactorNames = new ArrayList<>(); + for (int i = 0, j = projectList.size(); i < j; i++) { + FactorProject factorProject = projectList.get(i); + String riskFactorName = factorProject.getRiskFactorName(); + List wayList = factorProject.getWayList(); + if (CollectionUtils.isNotEmpty(wayList)) { + if ("健康".equals(factorProject.getRiskFactorName())) { + healthList.addAll(wayList); + } else { + riskList.addAll(wayList); + riskFactorNames.add(riskFactorName); } } } - if (CollectionUtils.isNotEmpty(healthList)){ - factorProjectManage.setHealthItemList(checkItemService.selectByIds(healthList)); - } - if (CollectionUtils.isNotEmpty(riskList)){ - factorProjectManage.setRiskItemList(checkItemService.selectByIds(riskList)); - } + + factorProjectManage.setHealthItemList(healthList); + factorProjectManage.setRiskItemList(riskList); + factorProjectManage.setRiskFactorNames(riskFactorNames); return factorProjectManage; } return null; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java new file mode 100644 index 0000000..3f7dfac --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/ProjectWayServiceImpl.java @@ -0,0 +1,45 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.master.ProjectWayMapper; +import com.lyms.platform.permission.model.ProjectWay; +import com.lyms.platform.permission.service.ProjectWayService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("projectWayService") +public class ProjectWayServiceImpl implements ProjectWayService { + @Autowired + private ProjectWayMapper projectWayMapper; + + @Override + public List getList(List ids) { + return projectWayMapper.getList(ids); + } + + @Override + public void add(ProjectWay projectWay) { + projectWayMapper.add(projectWay); + } + + @Override + public void update(ProjectWay projectWay) { + projectWayMapper.update(projectWay); + } + + @Override + public void del(List id) { + projectWayMapper.del(id); + } + + @Override + public void insertBatch(List list) { + projectWayMapper.insertBatch(list); + } + + @Override + public ProjectWay selectById(Integer id) { + return projectWayMapper.selectById(id); + } +} diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml index c0464a6..d99dc1a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/FactorProjectMapper.xml @@ -6,7 +6,6 @@ - @@ -19,13 +18,14 @@ - SELECT id, - risk_factor_name,week_project_id,risk_factor_ids, + risk_factor_name,risk_factor_ids, week,hospital_id,created FROM lyms_factor_project where - hospital_id = #{hospitalId,jdbcType=INTEGER} + hospital_id = #{hospitalId,jdbcType=INTEGER} and week=#{week,jdbcType=VARCHAR} @@ -38,13 +38,13 @@ - + + INSERT INTO lyms_factor_project(risk_factor_ids,risk_factor_name,week,hospital_id,created) + VALUES (#{riskFactorIds},#{riskFactorName},#{week},#{hospitalId},#{created}) + - + update lyms_factor_project @@ -53,9 +53,6 @@ risk_factor_name = #{riskFactorName,jdbcType=VARCHAR}, - - week_project_id = #{weekProjectId,jdbcType=VARCHAR}, - hospital_id = #{hospitalId,jdbcType=INTEGER}, @@ -81,11 +78,67 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml new file mode 100644 index 0000000..dd41073 --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/ProjectWayMapper.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + INSERT INTO lyms_project_way(week_project_id,week_project_name,factor_id,way,sort) + VALUES (#{weekProjectId},#{weekProjectName},#{factorId},#{way},#{sort}) + + + + insert into lyms_project_way(week_project_id,week_project_name,factor_id,way,sort) + values + + (#{entity.weekProjectId},#{entity.weekProjectName},#{entity.factorId},#{entity.way},#{entity.sort}) + + + + update lyms_project_way + + + week_project_id = #{weekProjectId,jdbcType=VARCHAR}, + + + week_project_name = #{weekProjectName,jdbcType=VARCHAR}, + + + factor_id = #{factorId,jdbcType=VARCHAR}, + + + way = #{way,jdbcType=VARCHAR}, + + + sort = #{sort,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=INTEGER} + + + + delete from lyms_project_way where id in + + + #{item} + + + + + + + \ No newline at end of file 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 feba717..cc2f617 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,10 +7,8 @@ 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.permission.model.FactorProject; -import com.lyms.platform.permission.model.FactorProjectEntity; -import com.lyms.platform.permission.model.FactorProjectManage; -import com.lyms.platform.permission.model.FactorProjectQuery; +import com.lyms.platform.permission.model.*; +import com.lyms.platform.permission.service.CheckItemService; import com.lyms.platform.permission.service.FactorProjectService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -27,6 +25,9 @@ public class FactorProjectController extends BaseController { @Autowired @Qualifier("factorProjectService") private FactorProjectService factorProjectService; + @Autowired + @Qualifier("cfCheckItemService") + private CheckItemService checkItemService; @RequestMapping(value = "/getList", method = RequestMethod.GET) @ResponseBody @@ -63,7 +64,7 @@ public class FactorProjectController extends BaseController { } @RequestMapping(value = "/update", method = RequestMethod.POST) - //@TokenRequired + @TokenRequired public void update(HttpServletResponse response, @RequestBody FactorProject factorProject) { if (factorProject.getId() == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); @@ -78,10 +79,9 @@ public class FactorProjectController extends BaseController { if (id == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); } - FactorProject factorProject= factorProjectService.selectById(id); - if (factorProject!=null){ - factorProjectService.del(id); - } + + factorProjectService.del(id); + ResultUtils.buildSuccessResultAndWrite(response); } @@ -94,27 +94,38 @@ public class FactorProjectController extends BaseController { if (id == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); } - FactorProjectManage factorProject= factorProjectService.selectInfo(id); - + FactorProject factorProject= factorProjectService.selectInfo(id); ResultUtils.buildSuccessResultAndWrite(response,factorProject); } - @RequestMapping(value = "/selectByWeek", method = RequestMethod.GET) + @RequestMapping(value = "/selectCheckItem", method = RequestMethod.GET) //@TokenRequired public void selectInfo(HttpServletResponse response, - @RequestParam(value = "hospitalId") Integer hospitalId, - @RequestParam(value = "week") String week) { + @RequestParam(value = "ids")String ids) { + if (StringUtils.isEmpty(ids)) { + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); + } + + List itemList= checkItemService.selectByIds(ids.split(",")); + ResultUtils.buildSuccessResultAndWrite(response,itemList); + } + + @RequestMapping(value = "/selectByWeek", method = RequestMethod.POST) + //@TokenRequired + public void selectInfo(HttpServletResponse response, + @RequestBody ProjectWayQuery projectWayQuery) { + Integer hospitalId= projectWayQuery.getHospitalId(); + String week= projectWayQuery.getWeek(); if (hospitalId == null) { ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空"); } - FactorProjectQuery factorProjectQuery=new FactorProjectQuery(); - factorProjectQuery.setHospitalId(hospitalId); - factorProjectQuery.setWeek(week); - FactorProjectEntity factorProject= factorProjectService.selectByWeek(factorProjectQuery); + if (StringUtils.isEmpty(week)) { + ResultUtils.buildParameterErrorResultAndWrite(response, "孕周不能为空"); + } + FactorProjectEntity factorProject= factorProjectService.selectByWeek(hospitalId,week); ResultUtils.buildSuccessResultAndWrite(response,factorProject); } - @RequestMapping(value = "/test", method = RequestMethod.GET) public void test(HttpServletResponse response){ bookbuildingFacade.bookbuildingSync(); 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 81259e6..9546d03 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 @@ -1232,7 +1232,6 @@ public class BookbuildingFacade { sendbuildingMsg(patients, SmsServiceEnums.CJYYTX.getId(), "【产检提醒】", "亲爱的孕妈妈，您当前孕周为" + week + ",请点击此处查看就诊流程。", week); if (CollectionUtils.isNotEmpty(patients.getRiskFactorId()) && !patients.getRiskFactorId().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { - //TODO 处理高危和健康跳转的页面逻辑 push_center try { FactorProjectQuery factorProjectQuery = new FactorProjectQuery(); factorProjectQuery.setHospitalId(Integer.valueOf(hospitalId)); -- 1.8.3.1