From 63485c1f7d026627e93287d4090a902aa7231994 Mon Sep 17 00:00:00 2001 From: czx <28353131@qq.com> Date: Thu, 28 Jan 2021 16:05:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=97=85=E6=82=A3=E6=8A=A5?= =?UTF-8?q?=E9=A4=90=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ClientPatientController.java | 2 +- .../FtReportMealsDaoController.java | 17 ++++++ .../mapper/FtReportMealsDaoMapper.java | 3 + .../service/IFtReportMealsDaoService.java | 2 + .../impl/FtReportMealsDaoServiceImpl.java | 5 ++ .../mapper/fantang/FtReportMealsDaoMapper.xml | 18 ++++++ ruoyi-ui/src/api/fantang/meals.js | 2 +- .../views/fantang/mealsStatistics/index.vue | 57 +++++++++++-------- 8 files changed, 81 insertions(+), 25 deletions(-) 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 76a075d92..d81aa798e 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 @@ -226,8 +226,8 @@ public class ClientPatientController extends BaseController { */ @PostMapping("/tomorrowReport") public AjaxResult tomorrowReport(@RequestBody JSONArray list){ - System.out.println(list); List objects = list.toJavaList(JSONObject.class); + logger.info("送餐员报餐总数：{}", objects.size()); for (JSONObject object : objects) { FtReportMealsDao dao = JSONObject.toJavaObject(object, FtReportMealsDao.class); reportMealsDaoService.updateById(dao); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java index 324f39d7c..b1862526c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java @@ -9,6 +9,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.fantang.domain.FtPrepaymentDao; import com.ruoyi.system.fantang.domain.FtReportMealsDao; @@ -224,4 +225,20 @@ public class FtReportMealsDaoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(iFtReportMealsDaoService.removeByIds(Arrays.asList(ids)) ? 1 : 0); } + + + @GetMapping("/listPatientReportMeals") + public TableDataInfo listPatientReportMeals(FtReportMealVo ftReportMealsDao) { + startPage(); + Date createAt = ftReportMealsDao.getCreateAt(); + + if (createAt != null) { + ftReportMealsDao.setBeginOfDay(createAt); + ftReportMealsDao.setEndOfDay(createAt); + } + + List list = iFtReportMealsDaoService.listPatientReportMeals(ftReportMealsDao); + return getDataTable(list); + + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java index 3814181e9..f66715315 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java @@ -54,4 +54,7 @@ public interface FtReportMealsDaoMapper extends BaseMapper { @Select("SELECT a.patient_id,sum(a.price) as dinner_total_price , sum(a.nutrition_food_price ) as nutrition_total_price , sum(a.total_price) as sum_total_price FROM ft_report_meals a where a.patient_id = #{patientId} AND a.settlement_flag = 0 AND a.dining_flag = 1") ReportMealsPriceEntity sumAllTotalPrice(@Param("patientId") Long patientId); + + // SELECT a.*, b.`name` , b.bed_id, b.hospital_id, c.depart_name from ft_report_meals a LEFT JOIN ft_patient b on a.patient_id = b.patient_id LEFT JOIN ft_depart c on b.depart_id =c.depart_id where a.patient_id in (7) and a.create_at = CURDATE() + 1 + List listPatientReportMeals(FtReportMealVo ftReportMealsDao); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java index aa0f69f91..6d04624a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java @@ -40,5 +40,7 @@ public interface IFtReportMealsDaoService extends IService { List listAllNutrition(FtReportMealsDao ftReportMealsDao); List getStatisticsFoods(Integer departId, Date day); + + List listPatientReportMeals(FtReportMealVo ftReportMealsDao); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java index 676ab7936..141931613 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java @@ -140,4 +140,9 @@ public class FtReportMealsDaoServiceImpl extends ServiceImpl listPatientReportMeals(FtReportMealVo ftReportMealsDao) { + return this.baseMapper.listPatientReportMeals(ftReportMealsDao); + } } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml index 10d14151c..84eacc8e8 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml @@ -117,5 +117,23 @@ and a.type = #{type} + \ No newline at end of file diff --git a/ruoyi-ui/src/api/fantang/meals.js b/ruoyi-ui/src/api/fantang/meals.js index d4e29ec52..fd7967941 100644 --- a/ruoyi-ui/src/api/fantang/meals.js +++ b/ruoyi-ui/src/api/fantang/meals.js @@ -40,7 +40,7 @@ export function listPayoff(query) { // 查询报餐管理列表 export function listMeals(query) { return request({ - url: '/fantang/meals/list', + url: '/fantang/meals/listPatientReportMeals', method: 'get', params: query }) diff --git a/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue b/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue index c0af7ef4a..648c0e65f 100644 --- a/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue +++ b/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue @@ -9,24 +9,10 @@ placeholder="选择报餐日期"> - - - - - - + - - - - + + + + + + + + + + + + + + + + - - - -