From a485c380200759905753498875dd260cce9cddf7 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 28 十月 2026 17:02:18 +0800
Subject: [PATCH] 修改了统计
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 48 ++++++++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java | 5
ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml | 15 ++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java | 38 ++++--
ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java | 23 +--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 12 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 7 -
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java | 6 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java | 54 +++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java | 21 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java | 41 ++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java | 44 ++----
ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java | 2
ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml | 7
15 files changed, 241 insertions(+), 84 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index b7655b0..c529985 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -166,4 +166,16 @@
public TableDataInfo getListBySpStatChange(@RequestBody SpStatChangeReq spStatChangeReq) {
return getDataTable(serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq));
}
+
+ /**
+ * 瀵煎嚭鏀舵缁熻
+ */
+ @ApiOperation("瀵煎嚭鏀舵缁熻")
+ @Log(title = "鏀舵缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportChange")
+ public AjaxResult exportChange(SpStatChangeReq spStatChangeReq) {
+ List<SpStatChange> list = serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq);
+ ExcelUtil<SpStatChange> util = new ExcelUtil<SpStatChange>(SpStatChange.class);
+ return util.exportExcel(list, "鏀舵缁熻鏁版嵁");
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index ff19deb..d03d66f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -12,6 +12,7 @@
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.SpStatBonus;
+import com.ruoyi.project.domain.SpStatBonusDept;
import com.ruoyi.project.domain.SpStatBonusReq;
import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
import com.ruoyi.project.domain.vo.TaxMoneySumEO;
@@ -234,11 +235,58 @@
// 閲戦 0.00 涓嶆樉绀�
for (SpStatBonus row : list) {
row.setAmount(blankZero(row.getAmount()));
+ row.setMamount(blankZero(row.getMamount()));
+ row.setSamount(blankZero(row.getSamount()));
+ row.setYamount(blankZero(row.getYamount()));
}
ExcelUtil<SpStatBonus> util = new ExcelUtil<SpStatBonus>(SpStatBonus.class);
return util.exportExcel(list, "缁╂晥缁熻鏁版嵁");
}
+ /**
+ * 瀵煎嚭缁╂晥缁熻锛堟寜涓氬姟缁勶級
+ */
+ @ApiOperation("瀵煎嚭缁╂晥缁熻锛堟寜涓氬姟缁勶級")
+ @Log(title = "缁╂晥缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportBonusDept")
+ public AjaxResult exportBonusDept(SpStatBonusReq spStatBonusReq) {
+ List<SpStatBonus> list = serviceFunddetailService.getListBySpStatBonus(spStatBonusReq);
+ Map<String, SpStatBonusDept> grouped = new LinkedHashMap<String, SpStatBonusDept>();
+ for (SpStatBonus row : list) {
+ String key = row.getDeptId() != null ? String.valueOf(row.getDeptId()) : row.getDeptName();
+ if (key == null) {
+ key = "";
+ }
+ SpStatBonusDept dept = grouped.get(key);
+ if (dept == null) {
+ dept = new SpStatBonusDept();
+ dept.setDeptname(row.getDeptName() == null ? "鏈垎缁�" : row.getDeptName());
+ dept.setAmount(BigDecimal.ZERO);
+ dept.setMamount(BigDecimal.ZERO);
+ dept.setSamount(BigDecimal.ZERO);
+ dept.setYamount(BigDecimal.ZERO);
+ grouped.put(key, dept);
+ }
+ dept.setAmount(dept.getAmount().add(nz(row.getAmount())));
+ dept.setMamount(dept.getMamount().add(nz(row.getMamount())));
+ dept.setSamount(dept.getSamount().add(nz(row.getSamount())));
+ dept.setYamount(dept.getYamount().add(nz(row.getYamount())));
+ }
+ List<SpStatBonusDept> result = new ArrayList<SpStatBonusDept>(grouped.values());
+ for (SpStatBonusDept dept : result) {
+ dept.setAmount(blankZero(dept.getAmount()));
+ dept.setMamount(blankZero(dept.getMamount()));
+ dept.setSamount(blankZero(dept.getSamount()));
+ dept.setYamount(blankZero(dept.getYamount()));
+ }
+ ExcelUtil<SpStatBonusDept> util = new ExcelUtil<SpStatBonusDept>(SpStatBonusDept.class);
+ return util.exportExcel(result, "缁╂晥缁熻锛堟寜涓氬姟缁勶級");
+ }
+
+ private BigDecimal nz(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
+ }
+
private BigDecimal blankZero(BigDecimal value) {
return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java
index acebb14..f6877a3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java
@@ -84,5 +84,46 @@
return util.exportExcel(list, "妗堜緥缁熻鏁版嵁");
}
+ /**
+ * 瀵煎嚭妗堜緥缁熻锛堟寜涓氬姟缁勶級
+ */
+ @ApiOperation("瀵煎嚭妗堜緥缁熻锛堟寜涓氬姟缁勶級")
+ @Log(title = "妗堜緥缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportDept")
+ public AjaxResult exportDept(SpStatCaseReq spStatCaseReq) {
+ List<SpStatCase> list = spstatCaseService.getListBypower(spStatCaseReq);
+ Map<String, SpStatCaseDept> grouped = new LinkedHashMap<String, SpStatCaseDept>();
+ for (SpStatCase row : list) {
+ String key = StringUtils.isNotEmpty(row.getDeptid()) ? row.getDeptid() : row.getDeptname();
+ if (key == null) {
+ key = "";
+ }
+ SpStatCaseDept dept = grouped.get(key);
+ if (dept == null) {
+ dept = new SpStatCaseDept();
+ dept.setDeptname(row.getDeptname() == null ? "鏈垎缁�" : row.getDeptname());
+ dept.setCaseTotal(0);
+ dept.setTerminationTotal(0);
+ grouped.put(key, dept);
+ }
+ dept.setCaseTotal(dept.getCaseTotal() + toInt(row.getWorkflowsum()));
+ dept.setTerminationTotal(dept.getTerminationTotal() + toInt(row.getTerminationcase()));
+ }
+ List<SpStatCaseDept> result = new ArrayList<SpStatCaseDept>(grouped.values());
+ ExcelUtil<SpStatCaseDept> util = new ExcelUtil<SpStatCaseDept>(SpStatCaseDept.class);
+ return util.exportExcel(result, "妗堜緥缁熻锛堟寜涓氬姟缁勶級");
+ }
+
+ private int toInt(String value) {
+ if (StringUtils.isEmpty(value)) {
+ return 0;
+ }
+ try {
+ return Integer.parseInt(value.trim());
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java
index 1addef2..112822e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.SpStatExpense;
+import com.ruoyi.project.domain.SpStatExpenseDept;
import com.ruoyi.project.domain.SpStatExpenseReq;
import com.ruoyi.project.service.SpstatExpenseService;
import io.swagger.annotations.Api;
@@ -20,7 +21,10 @@
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
/**
* 鎶ラ攢缁熻
@@ -68,6 +72,56 @@
return util.exportExcel(list, "璐圭敤缁熻鏁版嵁");
}
+ /**
+ * 瀵煎嚭璐圭敤缁熻锛堟寜涓氬姟缁勶級
+ */
+ @ApiOperation("瀵煎嚭璐圭敤缁熻锛堟寜涓氬姟缁勶級")
+ @Log(title = "璐圭敤缁熻", businessType = BusinessType.EXPORT)
+ @GetMapping("/exportDept")
+ public AjaxResult exportDept(SpStatExpenseReq spStatExpenseReq) {
+ List<SpStatExpense> list = spstatExpenseService.getListBySpstatExpense(spStatExpenseReq);
+ Map<String, SpStatExpenseDept> grouped = new LinkedHashMap<String, SpStatExpenseDept>();
+ for (SpStatExpense row : list) {
+ String key = row.getDeptmentno() != null ? row.getDeptmentno() : row.getDeptmentName();
+ if (key == null) {
+ key = "";
+ }
+ SpStatExpenseDept dept = grouped.get(key);
+ if (dept == null) {
+ dept = new SpStatExpenseDept();
+ dept.setDeptname(row.getDeptmentName() == null ? "鏈垎缁�" : row.getDeptmentName());
+ dept.setAmount(BigDecimal.ZERO);
+ dept.setExpertfee(BigDecimal.ZERO);
+ dept.setEthicalistfee(BigDecimal.ZERO);
+ dept.setMedicalcost(BigDecimal.ZERO);
+ dept.setOfficecost(BigDecimal.ZERO);
+ dept.setReimcost(BigDecimal.ZERO);
+ grouped.put(key, dept);
+ }
+ dept.setAmount(dept.getAmount().add(nz(row.getAmount())));
+ dept.setExpertfee(dept.getExpertfee().add(nz(row.getExpertfee())));
+ dept.setEthicalistfee(dept.getEthicalistfee().add(nz(row.getEthicalistfee())));
+ dept.setMedicalcost(dept.getMedicalcost().add(nz(row.getMedicalcost())));
+ dept.setOfficecost(dept.getOfficecost().add(nz(row.getOfficecost())));
+ dept.setReimcost(dept.getReimcost().add(nz(row.getReimcost())));
+ }
+ List<SpStatExpenseDept> result = new ArrayList<SpStatExpenseDept>(grouped.values());
+ for (SpStatExpenseDept dept : result) {
+ dept.setAmount(blankZero(dept.getAmount()));
+ dept.setExpertfee(blankZero(dept.getExpertfee()));
+ dept.setEthicalistfee(blankZero(dept.getEthicalistfee()));
+ dept.setMedicalcost(blankZero(dept.getMedicalcost()));
+ dept.setOfficecost(blankZero(dept.getOfficecost()));
+ dept.setReimcost(blankZero(dept.getReimcost()));
+ }
+ ExcelUtil<SpStatExpenseDept> util = new ExcelUtil<SpStatExpenseDept>(SpStatExpenseDept.class);
+ return util.exportExcel(result, "璐圭敤缁熻锛堟寜涓氬姟缁勶級");
+ }
+
+ private BigDecimal nz(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
+ }
+
private BigDecimal blankZero(BigDecimal value) {
return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
index 90e8a9f..c917138 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
@@ -19,13 +19,6 @@
private static final long serialVersionUID = 1L;
/**
- * 缁熻鏈堜唤
- */
- @ApiModelProperty("缁熻鏈堜唤")
- @Excel(name = "缁熻鏈堜唤", sort = 1)
- private String bonusmonth;
-
- /**
* 閮ㄩ棬id
*/
@ApiModelProperty("閮ㄩ棬id")
@@ -35,7 +28,7 @@
* 閮ㄩ棬鍚嶇О
*/
@ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "涓氬姟缁�", sort = 2)
+ @Excel(name = "涓氬姟缁�", sort = 1)
private String deptName;
/**
@@ -48,14 +41,35 @@
* 鏀剁泭浜哄鍚�
*/
@ApiModelProperty("鏀剁泭浜哄鍚�")
- @Excel(name = "涓撹亴浜哄憳", sort = 3)
+ @Excel(name = "缁╂晥浜哄憳", sort = 2)
private String beneficiaryname;
/**
- * 閲戦
+ * 缁╂晥閲戦
*/
- @ApiModelProperty("閲戦")
- @Excel(name = "閲戦", sort = 4, scale = 2)
+ @ApiModelProperty("缁╂晥閲戦")
+ @Excel(name = "缁╂晥閲戦", sort = 3, scale = 2)
private BigDecimal amount;
+ /**
+ * 鏈堝害缁╂晥閲戦
+ */
+ @ApiModelProperty("鏈堝害缁╂晥閲戦")
+ @Excel(name = "鏈堝害缁╂晥", sort = 4, scale = 2)
+ private BigDecimal mamount;
+
+ /**
+ * 瀛ｅ害缁╂晥閲戦
+ */
+ @ApiModelProperty("瀛ｅ害缁╂晥閲戦")
+ @Excel(name = "瀛ｅ害缁╂晥", sort = 5, scale = 2)
+ private BigDecimal samount;
+
+ /**
+ * 骞村害缁╂晥閲戦
+ */
+ @ApiModelProperty("骞村害缁╂晥閲戦")
+ @Excel(name = "骞村害缁╂晥", sort = 6, scale = 2)
+ private BigDecimal yamount;
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java
index 2ce7c45..b1557f2 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonusReq.java
@@ -41,11 +41,5 @@
@ApiModelProperty("pausername")
private String pausername = "";
- /**
- * 缁╂晥绫诲瀷锛�1銆佹湀搴︺��2銆佸搴︺��3銆佸勾搴�
- */
- @ApiModelProperty("缁╂晥绫诲瀷锛�1銆佹湀搴︺��2銆佸搴︺��3銆佸勾搴�")
- private String pabonustype = "";
-
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
index c2c4b21..f221831 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChange.java
@@ -1,61 +1,49 @@
package com.ruoyi.project.domain;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.Date;
+import java.math.BigDecimal;
/**
- * SP_STAT_EXPENSE
+ * 鏀舵缁熻锛圫P_STAT_CHANGE锛�
*
* @author ls
* @date 2024-03-11
*/
@Data
-@ApiModel("SP_STAT_CHANGE ")
+@ApiModel("SP_STAT_CHANGE")
public class SpStatChange {
private static final long serialVersionUID = 1L;
-
- /**
- * 鍖婚櫌缂栧彿
- */
- @ApiModelProperty("鍖婚櫌缂栧彿")
- private String hospitalno;
/**
* 鍖婚櫌鍚嶇О
*/
@ApiModelProperty("鍖婚櫌鍚嶇О")
+ @Excel(name = "鍖婚櫌鍚嶇О", sort = 1, width = 30)
private String hospitalname;
/**
- * 鎺ユ敹鏈堜唤
+ * 宸叉敹閲戦
*/
-// @ApiModelProperty("鎺ユ敹鏈堜唤")
-// @JsonFormat(pattern = "yyyy-MM")
- private String receivemonth;
+ @ApiModelProperty("宸叉敹閲戦")
+ @Excel(name = "宸叉敹閲戦", sort = 2, width = 16, cellType = Excel.ColumnType.NUMERIC, scale = 2)
+ private BigDecimal amount;
/**
- * 鍣ㄥ畼瀹為檯鏀跺埌璐圭敤
+ * 鏈敹閲戦
*/
- @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
- private double amount;
+ @ApiModelProperty("鏈敹閲戦")
+ @Excel(name = "鏈敹閲戦", sort = 3, width = 16, cellType = Excel.ColumnType.NUMERIC, scale = 2)
+ private BigDecimal nonpayment;
/**
- * nonpayment
+ * 搴旀敹閲戦
*/
- @ApiModelProperty("nonpayment")
- private double nonpayment;
-
- /**
- * organcharge
- */
- @ApiModelProperty("organcharge")
- private double organcharge;
-
+ @ApiModelProperty("搴旀敹閲戦")
+ @Excel(name = "搴旀敹閲戦", sort = 4, width = 16, cellType = Excel.ColumnType.NUMERIC, scale = 2)
+ private BigDecimal organcharge;
}
-
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
index 0ef2d3d..260acd6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatChangeReq.java
@@ -1,12 +1,11 @@
package com.ruoyi.project.domain;
-import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
- * SP_STAT_EXPENSE
+ * 鏀舵缁熻鏌ヨ鏉′欢
*
* @author ls
* @date 2024-03-11
@@ -17,17 +16,21 @@
private static final long serialVersionUID = 1L;
/**
- * 鍖婚櫌缂栧彿
+ * 妗堜緥鏃堕棿寮�濮�
*/
- @ApiModelProperty("鍖婚櫌缂栧彿")
- private String pahospitalno = "";
+ @ApiModelProperty("妗堜緥鏃堕棿寮�濮�")
+ private String pabegtime = "";
/**
- * 0:鏈敹娆炬儏鍐� 1:宸叉敹娆剧粺璁�
+ * 妗堜緥鏃堕棿缁撴潫
*/
- @ApiModelProperty("0:鏈敹娆炬儏鍐� 1:宸叉敹娆剧粺璁�")
- private String pachageflag;
+ @ApiModelProperty("妗堜緥鏃堕棿缁撴潫")
+ private String paendtime = "";
+ /**
+ * 鍖婚櫌鍚嶇О锛堟ā绯婏級
+ */
+ @ApiModelProperty("鍖婚櫌鍚嶇О")
+ private String pahospitalname = "";
}
-
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
index fd632f9..fd95631 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatExpense.java
@@ -19,13 +19,6 @@
private static final long serialVersionUID = 1L;
/**
- * 缁熻鏈堜唤
- */
- @ApiModelProperty("缁熻鏈堜唤")
- @Excel(name = "缁熻鏈堜唤", sort = 1)
- private String applymonth;
-
- /**
* 浜哄憳缂栧彿
*/
@ApiModelProperty("浜哄憳缂栧彿")
@@ -35,7 +28,7 @@
* 浜哄憳濮撳悕
*/
@ApiModelProperty("浜哄憳濮撳悕")
- @Excel(name = "涓撹亴浜哄憳", sort = 3)
+ @Excel(name = "涓撹亴浜哄憳", sort = 2)
private String username;
/**
@@ -48,49 +41,49 @@
* 閮ㄩ棬鍚嶇О
*/
@ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "涓氬姟缁�", sort = 2)
+ @Excel(name = "涓氬姟缁�", sort = 1)
private String deptmentName;
/**
* 閲戦鍚堣
*/
@ApiModelProperty("閲戦鍚堣")
- @Excel(name = "鎶ラ攢鎬婚噾棰�", sort = 4, scale = 2)
+ @Excel(name = "鎶ラ攢鎬婚噾棰�", sort = 3, scale = 2)
private BigDecimal amount;
/**
* 涓撳鍔冲姟璐�
*/
@ApiModelProperty("涓撳鍔冲姟璐�")
- @Excel(name = "涓撳璐�", sort = 5, scale = 2)
+ @Excel(name = "涓撳璐�", sort = 4, scale = 2)
private BigDecimal expertfee;
/**
* 浼︾悊涓撳璐�
*/
@ApiModelProperty("浼︾悊涓撳璐�")
- @Excel(name = "浼︾悊涓撳璐�", sort = 6, scale = 2)
+ @Excel(name = "浼︾悊涓撳璐�", sort = 5, scale = 2)
private BigDecimal ethicalistfee;
/**
* 鍖诲鎴愭湰
*/
@ApiModelProperty("鍖诲鎴愭湰")
- @Excel(name = "鍖诲鎴愭湰", sort = 7, scale = 2)
+ @Excel(name = "鍖诲鎴愭湰", sort = 6, scale = 2)
private BigDecimal medicalcost;
/**
* 鍔炲叕璐�
*/
@ApiModelProperty("鍔炲叕璐�")
- @Excel(name = "鍔炲叕璐�", sort = 8, scale = 2)
+ @Excel(name = "鍔炲叕璐�", sort = 7, scale = 2)
private BigDecimal officecost;
/**
* 宸梾璐�
*/
@ApiModelProperty("宸梾璐�")
- @Excel(name = "宸梾璐�", sort = 9, scale = 2)
+ @Excel(name = "宸梾璐�", sort = 8, scale = 2)
private BigDecimal reimcost;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
index 2e86ef9..22b2c43 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java
@@ -31,6 +31,6 @@
public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);
- public List<SpStatChange> getListBySpStatChange(@Param("PAHOSPITALNO") String PAHOSPITALNO, @Param("PACHAGEFLAG") String PACHAGEFLAG);
+ public List<SpStatChange> getListBySpStatChange(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
index 2b65341..b00d63e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java
@@ -22,6 +22,6 @@
@Mapper
public interface SpStatBonusMapper extends BaseMapper<SpStatBonus> {
- List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME, @Param("PABONUSTYPE") String PABONUSTYPE);
+ List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME);
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
index edfffc8..e456d46 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java
@@ -111,7 +111,10 @@
@Override
public List<SpStatChange> getListBySpStatChange(SpStatChangeReq spStatChangeReq) {
- return serviceDonorchargeorganMapper.getListBySpStatChange(spStatChangeReq.getPahospitalno(), spStatChangeReq.getPachageflag());
+ return serviceDonorchargeorganMapper.getListBySpStatChange(
+ spStatChangeReq.getPabegtime(),
+ spStatChangeReq.getPaendtime(),
+ spStatChangeReq.getPahospitalname());
}
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index d87d18f..5a31d9d 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -505,11 +505,6 @@
@Override
public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
- // PABONUSTYPE 鍦ㄥ瓨鍌ㄨ繃绋嬩腑鏄� INTEGER锛岀┖涓蹭細鎶� Incorrect integer value锛涚┖鍊兼寜 0锛堝叏閮級澶勭悊
- String bonusType = spStatBonusReq.getPabonustype();
- if (bonusType == null || bonusType.trim().isEmpty()) {
- bonusType = "0";
- }
- return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), bonusType);
+ return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername());
}
}
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
index 984852b..a580351 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml
@@ -148,9 +148,20 @@
where id = #{id} and del_flag=0
</update>
+ <resultMap id="SpStatChangeResult" type="com.ruoyi.project.domain.SpStatChange">
+ <result property="hospitalname" column="HospitalName"/>
+ <result property="amount" column="amount"/>
+ <result property="nonpayment" column="nonpayment"/>
+ <result property="organcharge" column="organcharge"/>
+ </resultMap>
+
<select id="getListBySpStatChange" statementType="CALLABLE"
- resultType="com.ruoyi.project.domain.SpStatChange">
- call `SP_STAT_CHANGE`(#{PAHOSPITALNO,mode=IN,jdbcType=VARCHAR},#{PACHAGEFLAG,mode=IN,jdbcType=VARCHAR})
+ resultMap="SpStatChangeResult">
+ call `SP_STAT_CHANGE`(
+ #{PABEGTIME,mode=IN,jdbcType=VARCHAR},
+ #{PAENDTIME,mode=IN,jdbcType=VARCHAR},
+ #{PAHOSPITALNAME,mode=IN,jdbcType=VARCHAR}
+ )
</select>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
index c960411..9abda69 100644
--- a/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/SpStatBonusMapper.xml
@@ -6,18 +6,19 @@
<!-- 鏂� SP 杩斿洖 dept_id / dept_name 涓嬪垝绾垮垪锛岄」鐩湭寮�鍚� mapUnderscoreToCamelCase锛岄渶鏄惧紡鏄犲皠 -->
<resultMap id="SpStatBonusResult" type="com.ruoyi.project.domain.SpStatBonus">
- <result property="bonusmonth" column="bonusmonth"/>
<result property="deptId" column="dept_id"/>
<result property="deptName" column="dept_name"/>
<result property="beneficiaryno" column="BeneficiaryNo"/>
<result property="beneficiaryname" column="BeneficiaryName"/>
<result property="amount" column="amount"/>
+ <result property="mamount" column="mamount"/>
+ <result property="samount" column="samount"/>
+ <result property="yamount" column="yamount"/>
</resultMap>
<select id="getListBySpStatBonus" statementType="CALLABLE"
resultMap="SpStatBonusResult">
- call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR
- })
+ call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
</select>
</mapper>
--
Gitblit v1.9.3