Merge remote-tracking branch 'origin/master' into master

ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtReportMealsDaoController.java

@@ -12,7 +12,6 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.fantang.domain.FtReportMealsDao;
-import com.ruoyi.system.fantang.domain.FtSettleDao;
 import com.ruoyi.system.fantang.entity.ReportMealsDayEntity;
 import com.ruoyi.system.fantang.service.IFtReportMealsDaoService;
 import com.ruoyi.system.fantang.vo.FtReportMealVo;
@@ -50,9 +49,17 @@ public class FtReportMealsDaoController extends BaseController {
         wrapper.orderByDesc("settlement_at");
         wrapper.last("limit 1");
         FtReportMealsDao ftReportMealsDao = iFtReportMealsDaoService.getOne(wrapper);
+        Date createAt = ftReportMealsDao.getCreateAt();
         Date settlementAt = ftReportMealsDao.getSettlementAt();
-        long days = DateUtil.between(settlementAt, new Date(), DateUnit.DAY);
         ReportMealsDayEntity reportMealsDayEntity = new ReportMealsDayEntity();
+        if (settlementAt == null) {
+            long betweenDays = DateUtil.between(createAt, new Date(), DateUnit.DAY);
+            reportMealsDayEntity.setDays(betweenDays);
+            reportMealsDayEntity.setLastCreateDate(createAt);
+            return AjaxResult.success(reportMealsDayEntity);
+        }
+        long days = DateUtil.between(settlementAt, new Date(), DateUnit.DAY);
+
         reportMealsDayEntity.setSettlementAt(settlementAt);
         reportMealsDayEntity.setDays(days);
 
@@ -135,6 +142,7 @@ public class FtReportMealsDaoController extends BaseController {
 
     /**
      * 计算两个日期之间的未结算数据
+     *
      * @param dao
      * @return
      */

ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtSettleDaoController.java

@@ -17,6 +17,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -92,6 +93,8 @@ public class FtSettleDaoController extends BaseController {
     @Log(title = "结算报", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FtSettleDao ftSettleDao) {
+        ftSettleDao.setSettleAt(new Date());
+        ftSettleDao.setReceipts(ftSettleDao.getNetPeceipt());
         return toAjax(iFtSettleDaoService.save(ftSettleDao) ? 1 : 0);
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtSettleDao.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.fantang.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -94,4 +95,7 @@ public class FtSettleDao implements Serializable {
      */
     @Excel(name = "退款总额")
     private BigDecimal refund;
+
+    @TableField(exist = false)
+    private BigDecimal netPeceipt;
 }

ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/ReportMealsDayEntity.java

@@ -15,4 +15,6 @@ public class ReportMealsDayEntity  extends FtReportMealsDao {
     private Date selectBillingDate;
     // 自上一次结算累计未结算天数
     private Long days;
+    // 上次缴费日期
+    private Date lastCreateDate;
 }

ruoyi-ui/src/views/fantang/settle/index.vue

@@ -161,7 +161,7 @@
 
     <!--    日常收费弹出层对话框-->
     <el-dialog title="伙食费结算窗口" :visible.sync="flagAddNewSettlementOpen" width="1000px" append-to-body>
-      <el-form ref="form" :model="formAddNewSettlement" :rules="rules" label-width="160px">
+      <el-form ref="formAddNewSettlement" :model="formAddNewSettlement" :rules="rules" label-width="160px">
         <el-form-item label="住院号" prop="hospitalId">
           <el-input v-model="formAddNewSettlement.hospitalId" :disabled="true"/>
         </el-form-item>
@@ -184,8 +184,8 @@
         </el-row>
         <el-row :gutter="10">
           <el-col :span="8">
-            <el-form-item label="上次结算日期" prop="lastBillingDate">
-<!--              <el-input v-model="formAddNewSettlement.lastBillingDate" :disabled="true"/>-->
+            <el-form-item label="上次结算日期" prop="lastBillingDate" v-if="lastBillFlag">
+              <!--              <el-input v-model="formAddNewSettlement.lastBillingDate" :disabled="true"/>-->
               <el-date-picker
                 v-model="formAddNewSettlement.lastBillingDate"
                 align="right"
@@ -229,29 +229,27 @@
     </el-dialog>
 
     <!--    出院结算弹出层对话框-->
-
-    <!-- 添加或修改结算报对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="leaveForm" :model="leaveForm" :rules="rules" label-width="80px">
         <el-form-item label="记录清单" prop="list">
-          <el-input v-model="form.list" placeholder="请输入记录清单"/>
+          <el-input v-model="leaveForm.list" placeholder="请输入记录清单"/>
         </el-form-item>
         <el-form-item label="结算总价" prop="price">
-          <el-input v-model="form.price" placeholder="请输入结算总价"/>
+          <el-input v-model="leaveForm.price" placeholder="请输入结算总价"/>
         </el-form-item>
         <el-form-item label="应收" prop="payable">
-          <el-input v-model="form.payable" placeholder="请输入应收"/>
+          <el-input v-model="leaveForm.payable" placeholder="请输入应收"/>
         </el-form-item>
         <el-form-item label="实收" prop="receipts">
-          <el-input v-model="form.receipts" placeholder="请输入实收"/>
+          <el-input v-model="leaveForm.receipts" placeholder="请输入实收"/>
         </el-form-item>
         <el-form-item label="结算类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择结算类型">
+          <el-select v-model="leaveForm.type" placeholder="请选择结算类型">
             <el-option label="请选择字典生成" value=""/>
           </el-select>
         </el-form-item>
         <el-form-item label="退款总额" prop="refund">
-          <el-input v-model="form.refund" placeholder="请输入退款总额"/>
+          <el-input v-model="leaveForm.refund" placeholder="请输入退款总额"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -264,10 +262,9 @@
 
 <script>
 import {addSettle, delSettle, exportSettle, getSettle, listSettle, updateSettle} from "@/api/fantang/settle";
-import {listAll, listNoPay, listPayoff} from "@/api/fantang/meals";
+import {getLastSettlementDate, listAll, listNoPay, listPayoff} from "@/api/fantang/meals";
 import {getUserProfile} from "@/api/system/user";
 import {getPrepaymentByPatientId} from "@/api/fantang/prepayment";
-import {getLastSettlementDate} from "@/api/fantang/meals";
 
 export default {
   name: "Settle",
@@ -299,6 +296,8 @@ export default {
           }
         }]
       },
+      //上次结算日期标志
+      lastBillFlag: true,
       // 权限相关的参数
       userName: null,
       roleGroup: null,
@@ -380,6 +379,7 @@ export default {
       },
       // 表单参数
       form: {},
+      leaveForm: {},
       // 表单校验
       rules: {
         list: [
@@ -418,12 +418,15 @@ export default {
       var dateSpan, iDays;
       let sDate1 = Date.parse(this.formAddNewSettlement.lastBillingDate);
       let sDate2 = Date.parse(value);
+      console.log("sDate1---", sDate1, "sDate2---", sDate2)
       dateSpan = sDate2 - sDate1;
+      console.log("qqqqqqqqqqqqqqqqqqqqqqqqqqq", dateSpan);
       if (dateSpan <= 0) {
         this.msgError("你现在的结算日期小于上一次结算日期！！");
       } else {
         dateSpan = Math.abs(dateSpan);
         iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
+        console.log("ddddddddddddddddddddddddddddd", iDays);
         this.formAddNewSettlement.settlementDays = iDays;
       }
     },
@@ -440,7 +443,14 @@ export default {
     clickAddNewSettlement(row) {
       getLastSettlementDate(row.patientId).then(response => {
         console.log("getLastBillingDateByPatientId-->", response);
+        if (response.data.settlementAt === null) {
+          this.lastBillFlag = false;
+          this.formAddNewSettlement.lastBillingDate = response.data.lastCreateDate;
+          this.msgInfo("该病人首次收费")
+        } else {
+          this.lastBillFlag = true;
           this.formAddNewSettlement.lastBillingDate = response.data.settlementAt;
+        }
         this.formAddNewSettlement.settlementDays = response.data.days;
       });
 
@@ -563,7 +573,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["formAddNewSettlement"].validate(valid => {
         if (valid) {
           if (this.form.settleId != null) {
             updateSettle(this.form).then(response => {
@@ -572,10 +582,15 @@ export default {
               this.getList();
             });
           } else {
-            addSettle(this.form).then(response => {
+            console.log(this.formAddNewSettlement);
+            addSettle(this.formAddNewSettlement).then(response => {
               this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
+              this.flagAddNewSettlementOpen = false;
+              listNoPay(this.queryParams).then(response => {
+                this.settleList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+              });
             });
           }
         }