update:军保页面增加军保支付筛选

src/main/java/com/saye/hospitalgd/controller/MilitaryInsuranceController.java

@@ -19,10 +19,12 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.io.File;
-import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -82,7 +84,8 @@ public class MilitaryInsuranceController {
 
         try {
             HashMap<Object, Object> map = new HashMap<Object, Object>();
-            map.put("payType", "3"); // 固定查询paytype=3的数据
+            List<String> payTypeList = Arrays.asList("3", "8");
+            map.put("payTypeList", payTypeList);
             map.put("startTime", startTime);
             map.put("endTime", endTime);
             map.put("likeFiled", likeFiled);

src/main/resources/mapper/HisDetailMapper.xml

@@ -23,7 +23,13 @@
         ,ybtcAmount
         from hisbill_history
         <where>
-            <if test="payType!=null and payType!=''">
+            <if test="payTypeList != null and payTypeList.size() > 0">
+                and PayType in
+                <foreach collection="payTypeList" item="pt" open="(" separator="," close=")">
+                    #{pt}
+                </foreach>
+            </if>
+            <if test="(payTypeList == null or payTypeList.size() == 0) and payType!=null and payType!=''">
                 and PayType = #{payType}
             </if>
             <if test="bizType!=null and bizType!=''">
@@ -47,7 +53,13 @@
         select count(1)
         from hisbill_history
         <where>
-            <if test="payType!=null and payType!=''">
+            <if test="payTypeList != null and payTypeList.size() > 0">
+                and PayType in
+                <foreach collection="payTypeList" item="pt" open="(" separator="," close=")">
+                    #{pt}
+                </foreach>
+            </if>
+            <if test="(payTypeList == null or payTypeList.size() == 0) and payType!=null and payType!=''">
                 and PayType = #{payType}
             </if>
             <if test="bizType!=null and bizType!=''">
@@ -201,7 +213,13 @@
         ,ybtcAmount
         from hisbill_history
         where trade_date=#{trade_date}
-        <if test="payType!=null and payType!=''">
+        <if test="payTypeList != null and payTypeList.size() > 0">
+            and PayType in
+            <foreach collection="payTypeList" item="pt" open="(" separator="," close=")">
+                #{pt}
+            </foreach>
+        </if>
+        <if test="(payTypeList == null or payTypeList.size() == 0) and payType!=null and payType!=''">
             and PayType = #{payType}
         </if>
         <if test="tradingStatus!=null and tradingStatus!=''">
@@ -238,7 +256,13 @@
         select count(1) as num,cast(IFNULL(sum(Amount),0) as decimal(19,2)) as money
         from hisbill_history
         <where>
-            <if test="payType!=null and payType!=''">
+            <if test="payTypeList != null and payTypeList.size() > 0">
+                and PayType in
+                <foreach collection="payTypeList" item="pt" open="(" separator="," close=")">
+                    #{pt}
+                </foreach>
+            </if>
+            <if test="(payTypeList == null or payTypeList.size() == 0) and payType!=null and payType!=''">
                 and (PayType = #{payType} or PayType = CAST(#{payType} AS UNSIGNED))
             </if>
             <if test="startTime!=null and startTime!=''">

src/main/resources/templates/financialReconciliation/militaryInsurance.html

@@ -222,7 +222,12 @@
                         width: 120,
                         sort: false,
                         templet: function (d) {
-                            return '医院垫支'; // 固定显示为医院垫支，因为paytype=3
+                            if (d.PAYTYPE === '3') {
+                                return '医院垫支';
+                            } else if (d.PAYTYPE === '8') {
+                                return '军保支付';
+                            }
+                            return d.PAYTYPE;
                         }
                     },