abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

窗口收费查看所有未结算

Browse Source
This commit is contained in:
ryoeiken 2021-01-22 09:01:47 +08:00
parent 1c4c13a83a
commit 974f1fb229
6 changed files with 136 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

3
ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtReportMealsDaoMapper.java
View File

@ -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);
}

3
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtReportMealsDaoService.java
View File

@ -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);

5
ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtReportMealsDaoServiceImpl.java
View File

@ -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) {

7
ruoyi-ui/src/api/fantang/settle.js
View File

@ -14,6 +14,13 @@ export function getLastBillingDateByPatientId(patientId) {
})
}
// 查看该病人所有已用餐未结算的记录
export function showAllMealsWithNoPay(patientId) {
return request({
url: '/fantang/settle/showAllMealsWithNoPay/' + patientId,
method: 'get'
})
}
// 查询结算报列表

44
ruoyi-ui/src/views/fantang/settle/index.vue
View File

@ -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,