门诊报表优化

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

@@ -861,7 +861,7 @@ public interface MzChargeDetailMapper {
                     "  end " +
                     ") =#{execDept} " +
                     "</when>" +
-                    " and charge_date <![CDATA[>=]]> #{beginDate} and charge_date <![CDATA[<=]]> #{endDate} group by " +
+                    " group by " +
                     "z.name,c.audit_code,isnull(a.group_no,'00')," +
                     " case a.charge_bill_code when 'BILL10' then 'BILL01' when 'BILL11' then 'BILL28' when 'BILL12' then 'BILL02' else a.charge_bill_code end" +
                     ",b.charge_dcount_date,b.pay_id ",

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

@@ -1142,6 +1142,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             mz.setDcountDate(null);
             mz.setChargeDcountDate(null);
             mz.setChargeDcountNo(YesNoEnum.NO.code);
+            mz.setFpFlag(null);
             newReceiptSerials.add(mz);
         }
         return newReceiptSerials;