From a425c40b21d9f950b4a92472cd0f619d94a9259e Mon Sep 17 00:00:00 2001 From: ryoeiken <754264374@qq.com> Date: Fri, 29 Jan 2021 09:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=97=85=E6=82=A3=E6=8A=A5=E9=A4=90=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=AF=BC=E5=87=BA=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=BB=98=E8=AE=A4=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E7=94=A8=E9=A4=90=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FtReportMealsDaoController.java | 19 ++++-- .../fantang/domain/FtReportMealsDao.java | 68 ++++++++++--------- .../fantang/mapper/FtReportMealVoMapper.java | 4 +- .../mapper/FtReportMealsDaoMapper.java | 2 +- .../service/IFtReportMealsDaoService.java | 2 +- .../impl/FtReportMealsDaoServiceImpl.java | 2 +- .../system/fantang/vo/FtReportMealVo.java | 4 +- .../views/fantang/mealsStatistics/index.vue | 16 ++--- 8 files changed, 66 insertions(+), 51 deletions(-) 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 b1862526c..67b9cd245 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 @@ -169,10 +169,17 @@ public class FtReportMealsDaoController extends BaseController { @Log(title = "报餐管理", businessType = BusinessType.EXPORT) @GetMapping("/export") public AjaxResult export(FtReportMealsDao ftReportMealsDao) { - LambdaQueryWrapper lqw = new LambdaQueryWrapper(ftReportMealsDao); - List list = iFtReportMealsDaoService.list(lqw); - ExcelUtil util = new ExcelUtil(FtReportMealsDao.class); - return util.exportExcel(list, "meals"); + Date createAt = ftReportMealsDao.getCreateAt(); + + if (createAt != null) { + ftReportMealsDao.setBeginOfDay(createAt); + ftReportMealsDao.setEndOfDay(createAt); + } + + List list = iFtReportMealsDaoService.listPatientReportMeals(ftReportMealsDao); + + ExcelUtil util = new ExcelUtil<>(FtReportMealsDao.class); + return util.exportExcel(list, "病患报餐统计"); } @@ -228,7 +235,7 @@ public class FtReportMealsDaoController extends BaseController { @GetMapping("/listPatientReportMeals") - public TableDataInfo listPatientReportMeals(FtReportMealVo ftReportMealsDao) { + public TableDataInfo listPatientReportMeals(FtReportMealsDao ftReportMealsDao) { startPage(); Date createAt = ftReportMealsDao.getCreateAt(); @@ -237,7 +244,7 @@ public class FtReportMealsDaoController extends BaseController { ftReportMealsDao.setEndOfDay(createAt); } - List list = iFtReportMealsDaoService.listPatientReportMeals(ftReportMealsDao); + List list = iFtReportMealsDaoService.listPatientReportMeals(ftReportMealsDao); return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java index b7d6eadd2..0073395b7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java @@ -38,6 +38,34 @@ public class FtReportMealsDao implements Serializable { @TableId(value = "id") private Long id; + /** + * 科室名 + */ + @TableField(exist = false) + @Excel(name = "部门名称") + private String departName; + + /** + * 住院号 + */ + @TableField(exist = false) + @Excel(name = "住院号") + private String hospitalId; + + /** + * 床号 + */ + @TableField(exist = false) + @Excel(name = "床号") + private String bedId; + + /** + * 病人姓名 + */ + @TableField(exist = false) + @Excel(name = "姓名") + private String name; + /** * 报餐日期 */ @@ -48,7 +76,7 @@ public class FtReportMealsDao implements Serializable { /** * 报餐类型 */ - @Excel(name = "报餐类型") + @Excel(name = "报餐类型", readConverterExp = "1=早餐,2=午餐,3=晚餐,4=加餐") private Long type; /** @@ -59,19 +87,17 @@ public class FtReportMealsDao implements Serializable { /** * 报餐人 */ - @Excel(name = "报餐人") private Long createBy; /** * 订单列表 */ - @Excel(name = "订单列表") private String foods; /** * 正餐总价 */ - @Excel(name = "总价") + @Excel(name = "正餐总价") private BigDecimal price; /** @@ -86,36 +112,12 @@ public class FtReportMealsDao implements Serializable { private String settlementBy; - /** - * 住院号 - */ - @TableField(exist = false) - private String hospitalId; - /** * 科室 id */ @TableField(exist = false) private String departId; - /** - * 科室名 - */ - @TableField(exist = false) - private String departName; - - /** - * 床号 - */ - @TableField(exist = false) - private String bedId; - - /** - * 病人姓名 - */ - @TableField(exist = false) - private String name; - /** * 营养餐 id */ @@ -134,11 +136,13 @@ public class FtReportMealsDao implements Serializable { /** * 营养配餐价格 */ + @Excel(name = "营养配餐价格") private BigDecimal nutritionFoodPrice; /** * 当前报餐总价 */ + @Excel(name = "当餐总价") private BigDecimal totalPrice; private Boolean vegetables; @@ -166,9 +170,6 @@ public class FtReportMealsDao implements Serializable { @TableField(exist = false) private Integer cateringUsage; - @JsonFormat(pattern = "yyyy-MM-dd") - private Date diningAt; - /** * 用餐开始时间 */ @@ -184,5 +185,10 @@ public class FtReportMealsDao implements Serializable { /** * 用餐标志 */ + @Excel(name = "是否已用餐", readConverterExp = "1=是,0=否") private Integer diningFlag; + + @Excel(name = "用餐日期", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date diningAt; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java index d202c4cbe..9c22fe511 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealVoMapper.java @@ -31,8 +31,8 @@ public interface FtReportMealVoMapper extends BaseMapper { // select d.*, (select sum(price) from ft_food f where FIND_IN_SET(f.food_id,d.foods)) as price from ft_food_demand d // 根据病患配餐表，生成次日报餐记录，并通过ft_food 菜品价格计算菜单总价 @Insert("insert into ft_report_meals " + - "(create_at, type, patient_id, foods, settlement_flag, dining_at, price, open_flag , nutrition_food_flag, nutrition_food_id) " + - "select date_add(now(), interval 1 day), d.type, d.patient_id , d.foods, 0 , date_add(now(), interval 1 day), " + + "(create_at, type, patient_id, foods, settlement_flag, price, open_flag , nutrition_food_flag, nutrition_food_id) " + + "select date_add(now(), interval 1 day), d.type, d.patient_id , d.foods, 0 , " + "(select sum(price) from ft_food f " + "where FIND_IN_SET(f.food_id,d.foods)) as price, d.open_flag, 0, d.nutrition_food_id from ft_food_demand d " + "LEFT JOIN ft_patient p on p.patient_id = d.patient_id and p.off_flag = 0") 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 f66715315..527dab34f 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 @@ -56,5 +56,5 @@ public interface FtReportMealsDaoMapper extends BaseMapper { 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); + List listPatientReportMeals(FtReportMealsDao 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 6d04624a6..ef8edcec6 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 @@ -41,6 +41,6 @@ public interface IFtReportMealsDaoService extends IService { List getStatisticsFoods(Integer departId, Date day); - List listPatientReportMeals(FtReportMealVo ftReportMealsDao); + List listPatientReportMeals(FtReportMealsDao 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 141931613..0aac27371 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 @@ -142,7 +142,7 @@ public class FtReportMealsDaoServiceImpl extends ServiceImpl listPatientReportMeals(FtReportMealVo ftReportMealsDao) { + public List listPatientReportMeals(FtReportMealsDao ftReportMealsDao) { return this.baseMapper.listPatientReportMeals(ftReportMealsDao); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java index fae09e6c0..e06cfe5c9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtReportMealVo.java @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.vo; +import com.ruoyi.common.annotation.Excel; import com.ruoyi.system.fantang.domain.FtReportMealsDao; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +16,7 @@ import lombok.experimental.Accessors; */ @Data @ToString -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) @NoArgsConstructor @Accessors(chain = true) public class FtReportMealVo extends FtReportMealsDao { @@ -31,6 +32,7 @@ public class FtReportMealVo extends FtReportMealsDao { private String bedId; + @Excel(name = "部门名称") private String departName; private String hospitalId; diff --git a/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue b/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue index 33090355e..24030ec08 100644 --- a/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue +++ b/ruoyi-ui/src/views/fantang/mealsStatistics/index.vue @@ -260,42 +260,42 @@ export default { return '晚餐'; if (row.type === 4) return '加餐'; - }, + }, formatToRice(row) { - if(row.rice) + if (row.rice) return '加饭'; else return '-'; }, formatToMeat(row) { - if(row.meat) + if (row.meat) return '加肉'; else return '-'; }, formatToVegetables(row) { - if(row.vegetables) + if (row.vegetables) return '加菜'; else return '-'; }, formatToEgg(row) { - if(row.egg) + if (row.egg) return row.egg; else return '-'; }, formatToOpenFlag(row) { - if(row.openFlag) + if (row.openFlag) return '是'; else return '-'; }, formatToReplace(row) { if (row.openFlag) { - if(row.isReplaceFood) + if (row.isReplaceFood) return '替'; else return '加'; @@ -318,7 +318,7 @@ export default { }, formatToNutritionFoodFlag(row) { if (row.openFlag) { - if(row.nutritionFoodFlag) + if (row.nutritionFoodFlag) return '报'; else return '停';