发票问题优化

src/main/java/cn/hnthyy/thmz/controller/MzChargeDetailController.java

@@ -157,7 +157,7 @@ public class MzChargeDetailController {
                 billItemTypes.add("020");
                 billItemTypes.add("TC");
             }
-            List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.queryMzChargeDetailByBillItemCode(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(), mzChargeDetail.getBillItemCode(), billItemTypes);
+            List<MzChargeDetail> mzChargeDetailList = mzChargeDetailService.queryMzChargeDetailByBillItemCode(mzChargeDetail.getPatientId(), mzChargeDetail.getTimes(),mzChargeDetail.getPayMark(), mzChargeDetail.getBillItemCode(), billItemTypes);
             mzChargeDetailList = getMzChargeDetails(mzChargeDetail, mzChargeDetailList);
             resultMap.put("code", 0);
             resultMap.put("message", "查询费用明细列表信息成功");

src/main/java/cn/hnthyy/thmz/mapper/his/MzChargeDetailMapper.java

@@ -53,8 +53,11 @@ public interface MzChargeDetailMapper {
 
     /**
      * 按照费用类型查询费用明细
-     *
-     * @param
+     * @param patientId
+     * @param times
+     * @param payMark
+     * @param billItemCode 0 ，1 都是in 2 not in
+     * @param billItemTypes
      * @return
      */
     @Select({"<script>",
@@ -69,7 +72,7 @@ public interface MzChargeDetailMapper {
             "rtrim(self_flag) self_flag,rtrim(responce_type) responce_type,dec_amount,back_serial,input_time,cy_mtjs,cy_jsl,cy_zql,cy_fj,cy_ffcs,cy_fysm,supply_amount,rtrim(cy_jssm) cy_jssm,",
             "dept_no,gl_percent_ft,rtrim(yb_zf_flag) yb_zf_flag,orig_price,rtrim(try_result) try_result,rtrim(supply_exec) supply_exec,rtrim(cy_dj) cy_dj,rtrim(receive_flag) receive_flag,",
             "rtrim(chequ_type) chequ_type,rtrim(print_flag_yj) print_flag_yj,rtrim(confirm_flag_qx) confirm_flag_qx ",
-            "from dbo.mz_charge_detail where pay_mark=4 and patient_id =#{patientId,jdbcType=CHAR}  and times = #{times,jdbcType=INTEGER} ",
+            "from dbo.mz_charge_detail where pay_mark=#{payMark,jdbcType=CHAR} and patient_id =#{patientId,jdbcType=CHAR}  and times = #{times,jdbcType=INTEGER} ",
             "<choose>",
             "<when test='billItemCode==2'>",
             " and bill_item_code not in",
@@ -82,7 +85,7 @@ public interface MzChargeDetailMapper {
             "#{item}",
             "</foreach>",
             "</script>"})
-    List<MzChargeDetail> selectMzChargeDetailByBillItemCode(@Param("patientId") String patientId, @Param("times") Integer times, @Param("billItemCode") String billItemCode, @Param("billItemTypes") List<String> billItemTypes);
+    List<MzChargeDetail> selectMzChargeDetailByBillItemCode(@Param("patientId") String patientId, @Param("times") Integer times,@Param("payMark") String payMark, @Param("billItemCode") String billItemCode, @Param("billItemTypes") List<String> billItemTypes);
 
 
     /**

src/main/java/cn/hnthyy/thmz/service/his/MzChargeDetailService.java

@@ -59,7 +59,7 @@ public interface MzChargeDetailService {
      * @param
      * @return
      */
-    List<MzChargeDetail> queryMzChargeDetailByBillItemCode(String patientId,Integer times,String billItemCode,List<String> billItemTypes);
+    List<MzChargeDetail> queryMzChargeDetailByBillItemCode(String patientId,Integer times,String payMark,String billItemCode,List<String> billItemTypes);
 
     /**
      * 收费操作

src/main/java/cn/hnthyy/thmz/service/impl/his/MzChargeDetailServiceImpl.java

@@ -192,8 +192,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     }
 
     @Override
-    public List<MzChargeDetail> queryMzChargeDetailByBillItemCode(String patientId, Integer times, String billItemCode, List<String> billItemTypes) {
-        return mzChargeDetailMapper.selectMzChargeDetailByBillItemCode(patientId, times, billItemCode, billItemTypes);
+    public List<MzChargeDetail> queryMzChargeDetailByBillItemCode(String patientId, Integer times,String payMark, String billItemCode, List<String> billItemTypes) {
+        return mzChargeDetailMapper.selectMzChargeDetailByBillItemCode(patientId, times,payMark, billItemCode, billItemTypes);
     }
 
     @Override

src/main/resources/static/js/toll_administration.js

@@ -462,11 +462,18 @@ function initChargeDetailTable() {
  */
 function queryParamsForDetail(params) {
     var billItemGroup = getIndex("bill_item_group");
+    var payMarkGroup = getIndex("pay_mark_group");
     var temp = {
         patientId: $("#patientIdChargeItem").val(),
         times: $("#timesChargeItem").val(),
-        billItemCode: billItemGroup
+        billItemCode: billItemGroup,
+        payMark: 4
     };
+    if (payMarkGroup == 1) {
+        temp.payMark = 0;
+    } else if (payMarkGroup == 2) {
+        temp.payMark = 1;
+    }
     return temp;
 };