优化检查检验项目总金额计算方法

src/main/java/cn/hnthyy/thmz/controller/zd/JcJyController.java

@@ -910,16 +910,21 @@ public class JcJyController {
 
     private void setTotalAmount(List<Map<String, Object>> data) {
         if (data != null && data.size() > 0) {
-            BigDecimal amount = BigDecimal.ZERO;
+            BigDecimal totalAmount = BigDecimal.ZERO;
             for (Map map : data) {
                 BigDecimal chargeAmount = (BigDecimal) map.get("charge_amount");
-                if (chargeAmount != null) {
-                    amount = amount.add(chargeAmount);
+                if (chargeAmount == null) {
+                    chargeAmount= BigDecimal.ZERO;
                 }
+                Double amount = (Double) map.get("amount");
+                if (amount == null) {
+                    amount= Double.valueOf(0);
+                }
+                totalAmount = totalAmount.add(chargeAmount.multiply(BigDecimal.valueOf(amount)));
             }
             Map<String, Object> totalMap = new HashMap<>();
             totalMap.put("name", "合计");
-            totalMap.put("charge_amount", amount);
+            totalMap.put("charge_amount", totalAmount);
             data.add(totalMap);
         }
     }