From 48c922a3a933dce6869675e6a10a3b50928614df Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Wed, 30 Dec 2020 09:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=EF=BC=9A?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A=E7=97=85=E6=82=A3=E6=98=8E?= =?UTF-8?q?=E5=A4=A9=E7=9A=84=E8=AE=A2=E9=A4=90=E8=AE=B0=E5=BD=95,?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A=E7=A7=91=E5=AE=A4=E6=98=8E?= =?UTF-8?q?=E5=A4=A9=E7=9A=84=E6=8A=A5=E9=A4=90=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClientPatientController.java | 25 +++++++++++++-- .../fantang/mapper/FtPatientDaoMapper.java | 3 ++ .../fantang/service/IFtPatientDaoService.java | 10 +++--- .../service/impl/FtPatientDaoServiceImpl.java | 6 ++++ .../ruoyi/system/fantang/vo/FtDepartVo.java | 19 +++++++++++ .../ruoyi/system/fantang/vo/FtPatientVo.java | 1 - .../mapper/fantang/FtPatientDaoMapper.xml | 32 +++++++++++++++++++ 7 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtDepartVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java index 534dcb227..297921e5a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java @@ -1,9 +1,11 @@ package com.ruoyi.system.fantang.controller; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.fantang.service.IFtPatientDaoService; -import com.ruoyi.system.fantang.vo.FtPatientVo; +import com.ruoyi.system.fantang.vo.FtDepartVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -12,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; @RestController @@ -30,4 +31,24 @@ public class ClientPatientController extends BaseController { return AjaxResult.success(iFtPatientDaoService.getReportMealsToday(createAt, patientId)); } + + @GetMapping("/getReportMealsTomorrow/{patientId}") + public AjaxResult getReportMealsTomorrow(@PathVariable("patientId") Long patientId) { + + DateTime tomorrow = DateUtil.tomorrow(); + String formatDate = DateUtil.formatDate(tomorrow); + + return AjaxResult.success(iFtPatientDaoService.getReportMealsToday(formatDate, patientId)); + } + + @GetMapping("/getReportMealsByDepart/{departId}") + public AjaxResult getReportMealsByDepart(@PathVariable("departId") Long departId) { + + DateTime tomorrow = DateUtil.tomorrow(); + String formatDate = DateUtil.formatDate(tomorrow); + + FtDepartVo ftDepartVo = iFtPatientDaoService.getReportMealsByDepart(departId, formatDate); + + return AjaxResult.success(ftDepartVo); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java index 99cd81d8e..b3d249c46 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtPatientDaoMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtPatientDao; +import com.ruoyi.system.fantang.vo.FtDepartVo; import com.ruoyi.system.fantang.vo.FtPatientVo; import com.ruoyi.system.fantang.vo.ftSyncConflictVo; import org.apache.ibatis.annotations.Insert; @@ -52,4 +53,6 @@ public interface FtPatientDaoMapper extends BaseMapper { List syncConflictOtherAllEqual(); List getReportMealsToday(@Param("createAt") String createAt, @Param("patientId") Long patientId); + + FtDepartVo getReportMealsByDepart(@Param("departId") Long departId, @Param("createAt") String createAt); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java index 9c56fcc6d..29e3bac05 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtPatientDaoService.java @@ -1,11 +1,9 @@ package com.ruoyi.system.fantang.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.fantang.domain.FtPatientDao; -import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.system.fantang.vo.FtPatientVo; - -import java.util.List; +import com.ruoyi.system.fantang.vo.FtDepartVo; /** * 病人管理Service接口 @@ -15,5 +13,7 @@ import java.util.List; */ public interface IFtPatientDaoService extends IService { - AjaxResult getReportMealsToday(String createAt, Long patientId ); + AjaxResult getReportMealsToday(String createAt, Long patientId); + + FtDepartVo getReportMealsByDepart(Long departId, String createAt); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java index 24037d32a..e347ad950 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtPatientDaoServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.fantang.service.impl; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.system.fantang.vo.FtDepartVo; import com.ruoyi.system.fantang.vo.FtPatientVo; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,4 +24,9 @@ public class FtPatientDaoServiceImpl extends ServiceImpl reportMealsList; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPatientVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPatientVo.java index dbf610a23..57549df38 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPatientVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtPatientVo.java @@ -15,7 +15,6 @@ import java.util.List; @Data @NoArgsConstructor @AllArgsConstructor -@TableName(value="ft_patient",resultMap = "patientReportMealsResultMap") public class FtPatientVo extends FtPatientDao { List reportMealsList; diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml index 83d84f23b..5c7edb0af 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml @@ -36,4 +36,36 @@ WHERE a.patient_id = #{patientId} and c.create_at = #{createAt} + + + + + + + + + + + + + + + \ No newline at end of file