过滤自助开单的核酸申请

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

@@ -71,6 +71,9 @@ public interface MzChargeDetailMapper {
             "<when test='endTime!=null and mzChargeDetail.payMark eq 1'>",
             " and input_date &lt;=#{endTime,jdbcType=TIMESTAMP}",
             "</when>",
+            "<when test='filterSelfBilling!=null and filterSelfBilling eq 1'>",
+            " and doctor_code <![CDATA[<>]]> '99999' ",
+            "</when>",
             " group by patient_id,times,receipt_no,name,",
             "<when test='mzChargeDetail.payMark eq 0'>",
             " charge_date,",
@@ -208,6 +211,9 @@ public interface MzChargeDetailMapper {
             "<when test='endTime!=null and mzChargeDetail.payMark eq 1'>",
             " and input_date &lt;=#{endTime,jdbcType=TIMESTAMP}",
             "</when>",
+            "<when test='filterSelfBilling!=null and filterSelfBilling eq 1'>",
+            " and doctor_code <![CDATA[<>]]> '99999' ",
+            "</when>",
             " group by patient_id,times,receipt_no,name,",
             "<when test='mzChargeDetail.payMark eq 0'>",
             " charge_date,",

src/main/java/cn/hnthyy/thmz/pageDto/MzChargeDetailPageDto.java

@@ -30,7 +30,8 @@ public class MzChargeDetailPageDto {
     private YesNoEnum ownData;
     //当前用户的Id 当只看自己的数据的时候，设置当前登录用户的id
     private String opId;
-
+    //是否过滤自助开单处方 Yes 是，no否
+    private Integer filterSelfBilling;
     //查询的开始时间
     private String beginTimeStr;
     //查询的结束时间

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

@@ -173,10 +173,6 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     public int countMzChargeDetail(MzChargeDetailPageDto mzChargeDetailPageDto) {
         mzChargeDetailPageDto.setTableName("mz_charge_detail");
         Integer num = mzChargeDetailMapper.countMzChargeDetail(mzChargeDetailPageDto);
-//        if (num == null || num == 0) {
-//            mzChargeDetailPageDto.setTableName("mz_charge_detail_b");
-//            num = mzChargeDetailMapper.countMzChargeDetail(mzChargeDetailPageDto);
-//        }
         return num;
     }