From 936e2c79cd741472a6acfe28d730eb644b082cf7 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 21 十月 2024 14:22:19 +0800
Subject: [PATCH] 修改体检类型
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
index 10f1363..a2db689 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReservationController.java
@@ -13,12 +13,15 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner;
import com.ltkj.common.annotation.RepeatSubmit;
+import com.ltkj.common.core.domain.entity.SysDictData;
import com.ltkj.common.excelConfig.ExcelUtils;
import com.ltkj.common.task.TaskService;
import com.ltkj.common.utils.SecurityUtils;
@@ -29,6 +32,8 @@
import com.ltkj.hosp.dto.ExcelImportDto;
import com.ltkj.hosp.service.*;
import com.ltkj.mall.mallOrderUtils.TjConstants;
+import com.ltkj.system.service.ISysConfigService;
+import com.ltkj.system.service.ISysDictDataService;
import com.ltkj.web.config.pdfutils.PDFBinaryUtil;
import com.ltkj.web.config.redis.OrderDelayService;
import com.ltkj.web.config.task.TjReservationTask;
@@ -86,6 +91,10 @@
private TaskService taskService;
@Resource
private ITjReportTemplateService reportTemplateService;
+ @Autowired
+ private ISysDictDataService dictDataService;
+ @Autowired
+ private ISysConfigService configService;
@Value("${path.filePath}")
private String value;
@@ -157,6 +166,7 @@
@ApiOperation(value = "鏌ヨ浣撴棰勭害鍒楄〃鎺ュ彛(榛樿)")
public TableDataInfo list(TjReservation tjReservation) {
startPage();
+ tjReservation.setIsExpire(2);
List<TjReservation> list = tjReservationService.selectTjReservationList(tjReservation);
// if(null !=list && list.size()>0){
// for (TjReservation reservation : list) {
@@ -176,12 +186,12 @@
public TableDataInfo selectTjReservationByDelete(TjReservation tjReservation) {
startPage();
List<TjReservation> list = tjReservationService.selectTjReservationByDelete(tjReservation);
- if(null !=list && list.size()>0){
- for (TjReservation reservation : list) {
- reservation.setName(MatchUtils.hideCusName(reservation.getName()));
- reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
- reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
- }
+ if(null !=list && !list.isEmpty()){
+// for (TjReservation reservation : list) {
+// reservation.setName(MatchUtils.hideCusName(reservation.getName()));
+// reservation.setPhoe(MatchUtils.hidePhoneNum(reservation.getPhoe()));
+// reservation.setIdCard(MatchUtils.hideIdCardNum(reservation.getIdCard()));
+// }
}
return getDataTable(list);
}
@@ -409,12 +419,19 @@
}
}
for (TjDwGrouping groupingWz : groupingWzs) {
- if (null != groupingWz && groupingWz.getSex().equals(String.valueOf(tjReservation.getSex())) && groupingWz.getDwDeptId().equals(dwDept.getId())) {
+ if (null != groupingWz && groupingWz.getDwDeptId().equals(dwDept.getId())) {
tjReservation.setGroupingId(groupingWz.getId());
tjReservation.setGroupingName(groupingWz.getGroupingName());
tjReservation.setYsPrice(groupingWz.getYsPrice());
//鍚堣
- hjMoney = hjMoney.add(groupingWz.getYsPrice()); count+=1;
+ hjMoney = hjMoney.add(groupingWz.getYsPrice());count+=1;
+ if(tjReservation.getSex()==0){
+ manMoney=manMoney.add(groupingWz.getYsPrice()); manCount+=1;
+ }
+ if(tjReservation.getSex()==1){
+ woManMoney=woManMoney.add(groupingWz.getYsPrice());woManCount+=1;
+ }
+
}
}
LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -434,13 +451,13 @@
wrongList.add(tjReservation.getName());
}
}
- if (yyList.size() > 0) {
+ if (!yyList.isEmpty()) {
map.put("list", yyList);
map.put("hjMoney", hjMoney);
return AjaxResult.error("鎿嶄綔澶辫触,浠ヤ笂浜哄憳宸茬粡棰勭害鏃犻渶瀵煎叆!!!", map);
}
- if (wrongList.size() > 0) {
+ if (!wrongList.isEmpty()) {
map.put("list", wrongList);
map.put("hjMoney", hjMoney);
return AjaxResult.error("鎿嶄綔澶辫触, 璇疯鐪熸牳瀵逛俊鎭悗閲嶆柊瀵煎叆!!!", map);
@@ -774,6 +791,8 @@
//鍥綋浜烘暟鍚堣浠锋牸
BigDecimal compPay=new BigDecimal("0.00");
+ String payTypeGlTjType = configService.selectConfigByKey("reservation_pay_type_gl_tj_type");
+ JSONObject parseObj = JSONUtil.parseObj(payTypeGlTjType);
if (null != rightList && !rightList.isEmpty()) {
for (TjReservation reservation : rightList) {
@@ -795,11 +814,23 @@
reservation.setProIds(Joiner.on(",").join(proIds));
reservation.setReservationTime(DateUtil.parse(reservationTime, "yyyy-MM-dd"));
reservation.setCompanyId(dwGrouping.getDwId());
- reservation.setCompany(dwGrouping.getDwDeptName());
+ reservation.setCompany(dwGrouping.getDwName());
reservation.setPayType(Long.valueOf(dwGrouping.getPayType()));
+ LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SysDictData::getDictType,"reservation_pay_type");
+ wrapper.eq(SysDictData::getDictValue,reservation.getPayType());
+ SysDictData dictData = dictDataService.getOne(wrapper);
+ for (Map.Entry<String, Object> entry : parseObj.entrySet()) {
+ String[] split = entry.getValue().toString().split("-");
+ if (split[0].equals(String.valueOf(dictData.getDictCode()))){
+ reservation.setTjType(dictDataService.selectDictDataById(Long.valueOf(split[1])).getDictValue());
+ }
+ }
+
+
reservation.setPacId(dwDept.getId());
compPay=compPay.add(dwGrouping.getYsPrice());
- reservation.setTjType(String.valueOf(1));
+// reservation.setTjType(String.valueOf(1));
reservation.setTeamNo(teamNo);
reservation.setYxts(dto.getYxts());
tjReservationService.save(reservation);
--
Gitblit v1.8.0