窗口收费查看所有未结算

2021-01-22 09:01:47 +08:00 · 2021-01-22 09:01:47 +08:00 · 974f1fb229
commit 974f1fb229
parent 1c4c13a83a
6 changed files with 136 additions and 58 deletions
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java
@ -75,7 +75,27 @@ public class FtSettleDaoController extends BaseController {

        ReportMealsPriceEntity reportMealsPrice = iFtReportMealsDaoService.sumTotalPrice(patientId, lastBillingDate, selectBillingDate);

-        Map<String, Object> data = new HashMap<>();
+        Map<String, Object> data = new HashMap<>(2);
+        data.put("reportMealsList", reportMealsList);
+        data.put("reportMealsPrice", reportMealsPrice);
+
+        return AjaxResult.success(data);
+    }
+
+    @GetMapping("/showAllMealsWithNoPay/{patientId}")
+    public AjaxResult showAllMealsWithNoPay(@PathVariable Long patientId) {
+
+        // 查找该病人所有已用餐未结算记录
+        QueryWrapper<FtReportMealsDao> wrapper = new QueryWrapper<>();
+        wrapper.eq("patient_id", patientId);
+        wrapper.eq("dining_flag",0);
+        wrapper.eq("settlement_flag",0);
+
+        List<FtReportMealsDao> reportMealsList = iFtReportMealsDaoService.list(wrapper);
+
+        ReportMealsPriceEntity reportMealsPrice = iFtReportMealsDaoService.sumAllTotalPrice(patientId);
+
+        Map<String, Object> data = new HashMap<>(2);
        data.put("reportMealsList", reportMealsList);
        data.put("reportMealsPrice", reportMealsPrice);

--- 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
@ -42,4 +42,7 @@ public interface FtReportMealsDaoMapper extends BaseMapper<FtReportMealsDao> {
    List<FtReportMealsDao> listNutrition(@Param("beginOfDay") DateTime beginOfDay, @Param("endOfDay") DateTime endOfDay, FtReportMealsDao ftReportMealsDao);

    List<FtReportMealsDao> listAllNutrition(FtReportMealsDao ftReportMealsDao);
+
+    @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(Long patientId);
 }
--- 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
@ -6,7 +6,6 @@ import com.ruoyi.system.fantang.entity.ReportMealsDayEntity;
 import com.ruoyi.system.fantang.entity.ReportMealsPriceEntity;
 import com.ruoyi.system.fantang.vo.FtReportMealVo;

-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;

@ -32,6 +31,8 @@ public interface IFtReportMealsDaoService extends IService<FtReportMealsDao> {

    ReportMealsPriceEntity sumTotalPrice(Long patientId, Date lastBillingDate, Date selectBillingDate);

+    ReportMealsPriceEntity sumAllTotalPrice(Long patientId);
+
    FtReportMealsDao getLastReportMeals(Long patientId);

    List<FtReportMealsDao> listNutrition(FtReportMealsDao ftReportMealsDao);
--- 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
@ -73,6 +73,11 @@ public class FtReportMealsDaoServiceImpl extends ServiceImpl<FtReportMealsDaoMap
        return this.baseMapper.sumTotalPrice(patientId, lastBillingDate, selectBillingDate);
    }

+    @Override
+    public ReportMealsPriceEntity sumAllTotalPrice(Long patientId) {
+        return this.baseMapper.sumAllTotalPrice(patientId);
+    }
+
    @Override
    public FtReportMealsDao getLastReportMeals(Long patientId) {

--- a/ruoyi-ui/src/api/fantang/settle.js
+++ b/ruoyi-ui/src/api/fantang/settle.js
@ -14,6 +14,13 @@ export function getLastBillingDateByPatientId(patientId) {
  })
 }

+// 查看该病人所有已用餐未结算的记录
+export function showAllMealsWithNoPay(patientId) {
+  return request({
+    url: '/fantang/settle/showAllMealsWithNoPay/' + patientId,
+    method: 'get'
+  })
+}


 // 查询结算报列表
--- a/ruoyi-ui/src/views/fantang/settle/index.vue
+++ b/ruoyi-ui/src/views/fantang/settle/index.vue
@ -3,11 +3,11 @@
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="住院号" prop="hospitalId">
        <el-input
-          v-model="queryParams.hospitalId"
-          placeholder="请输入住院号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.hospitalId"
+            placeholder="请输入住院号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
        />
      </el-form-item>

@ -17,21 +17,21 @@
                   size="small"
                   @keyup.enter.native="handleQuery">
          <el-option
-            v-for="item in departOptions"
-            :key="item.departName"
-            :label="item.departName"
-            :value="item.departId">
+              v-for="item in departOptions"
+              :key="item.departName"
+              :label="item.departName"
+              :value="item.departId">
          </el-option>
        </el-select>
      </el-form-item>

      <el-form-item label="姓名" prop="name">
        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入姓名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.name"
+            placeholder="请输入姓名"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <!--      <el-form-item label="结算标志" prop="settlementFlag">-->
@ -56,11 +56,11 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['fantang:settle:export']"
+            type="warning"
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['fantang:settle:export']"
        >导出
        </el-button>
      </el-col>
@ -78,19 +78,19 @@
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="clickAddNewSettlement(scope.row)"
-            v-hasPermi="['fantang:settle:AddNewSettlement']"
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="clickAddNewSettlement(scope.row)"
+              v-hasPermi="['fantang:settle:AddNewSettlement']"
          >收费
          </el-button>
          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="clickAddLeaveSettlement(scope.row)"
-            v-hasPermi="['fantang:settle:AddLeaveSettlement']"
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="clickAddLeaveSettlement(scope.row)"
+              v-hasPermi="['fantang:settle:AddLeaveSettlement']"
          >查看详情
          </el-button>
        </template>
@ -98,11 +98,11 @@
    </el-table>

    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
    />

    <!--    日常收费弹出层对话框-->
@ -134,11 +134,11 @@
            <el-form-item label="上次结算 / 首次用餐" prop="lastBillingDate">
              <!--              <el-input v-model="formAddNewSettlement.lastBillingDate" :disabled="true"/>-->
              <el-date-picker
-                v-model="formAddNewSettlement.lastBillingDate"
-                align="right"
-                type="date"
-                value-format="yyyy-MM-dd"
-                :disabled="true">
+                  v-model="formAddNewSettlement.lastBillingDate"
+                  align="right"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  :disabled="true">
              </el-date-picker>
            </el-form-item>
          </el-col>
@ -161,13 +161,13 @@
          <el-col :span="8">
            <el-form-item label="结算日期" prop="selectBillingDate">
              <el-date-picker
-                v-model="formAddNewSettlement.selectBillingDate"
-                align="right"
-                type="date"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd"
-                @change="changeBillingDate"
-                :picker-options="pickerOptions">
+                  v-model="formAddNewSettlement.selectBillingDate"
+                  align="right"
+                  type="date"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+                  @change="changeBillingDate"
+                  :picker-options="pickerOptions">
              </el-date-picker>
            </el-form-item>
          </el-col>
@ -175,10 +175,10 @@
            <el-form-item label="支付方式" prop="payType">
              <el-select v-model="formAddNewSettlement.payType" placeholder="请选择支付方式">
                <el-option
-                  v-for="item in payTypeOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
+                    v-for="item in payTypeOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                </el-option>
              </el-select>
            </el-form-item>
@ -246,11 +246,11 @@
          <el-col :span="8">
            <el-form-item label="上次结算 / 首次用餐" prop="lastBillingDate">
              <el-date-picker
-                v-model="leaveForm.lastBillingDate"
-                align="right"
-                type="date"
-                value-format="yyyy-MM-dd"
-                :disabled="true">
+                  v-model="leaveForm.lastBillingDate"
+                  align="right"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  :disabled="true">
              </el-date-picker>
            </el-form-item>
          </el-col>
@ -298,7 +298,14 @@
 </template>

 <script>
-import {addSettle, delSettle, exportSettle, getSettle, showMealsWithSelect} from "@/api/fantang/settle";
+import {
+  addSettle,
+  delSettle,
+  exportSettle,
+  getSettle,
+  showAllMealsWithNoPay,
+  showMealsWithSelect
+} from "../../../api/fantang/settle";
 import {getLastSettlementDate, listAll, listMealsWithInSettle, listNoPay, listPayoff} from "@/api/fantang/meals";
 import {getUserProfile} from "@/api/system/user";
 import {listDepart} from "@/api/fantang/depart";
@ -532,6 +539,13 @@ export default {

    // 日常伙食费结算操作按钮
    clickAddNewSettlement(row) {
+
+      // 清空数据
+      this.mealsList = null;
+      this.sumTotalPrice = 0;
+      this.dinnerTotalPrice = 0;
+      this.nutritionTotalPrice = 0;
+
      getLastSettlementDate(row.patientId).then(response => {
        console.log("getLastBillingDateByPatientId-->", response);
        if (response.reportMeals.settlementAt === null) {
@ -565,6 +579,14 @@ export default {

    // 出院伙食费结算按钮
    clickAddLeaveSettlement(row) {
+
+      // 清空数据
+      this.mealsList = null;
+      this.sumTotalPrice = 0;
+      this.dinnerTotalPrice = 0;
+      this.nutritionTotalPrice = 0;
+
+      // 获取上次结算日期/首次用餐日期
      getLastSettlementDate(row.patientId).then(response => {
        if (response.reportMeals.settlementAt === null) {
          this.lastBillFlag = false;
@ -574,6 +596,7 @@ export default {
          this.leaveForm.lastBillingDate = response.reportMeals.settlementAt;
        }

+        // 查看是否有预付款
        if (response.prepayment === null) {
          this.leaveForm.prepayment = 0;
        } else {
@ -590,6 +613,24 @@ export default {
        this.leaveForm.price = row.price;
        this.leaveForm.netPeceipt = null;
        this.leaveForm.userName = this.userName;
+
+        showAllMealsWithNoPay(row.patientId).then(response => {
+          console.log(response);
+          this.mealsList = response.data.reportMealsList;
+
+          if (response.data.reportMealsPrice == null) {
+            this.dinnerTotalPrice = 0;
+            this.nutritionTotalPrice = 0;
+            this.sumTotalPrice = 0;
+          }
+
+          if (response.data.reportMealsPrice != null) {
+            this.dinnerTotalPrice = response.data.reportMealsPrice.dinnerTotalPrice;
+            this.nutritionTotalPrice = response.data.reportMealsPrice.nutritionTotalPrice;
+            this.sumTotalPrice = response.data.reportMealsPrice.sumTotalPrice;
+            this.formAddNewSettlement.netPeceipt = this.sumTotalPrice;
+          }
+        })
      });
    },

@ -651,6 +692,7 @@ export default {
        flag: null,
        refund: null
      };
+
      this.formAddNewSettlement = {
        selectBillingDate: null,
        payType: null,