Merge branch 'dev-1.1.1' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.1

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

@@ -1081,6 +1081,8 @@ public interface MzChargeDetailMapper {
      * @param printFlag
      * @return
      */
-    @Select("select patient_id,times,order_no,group_no from mz_charge_detail where print_flag=#{printFlag} and group_no = '71' and datediff(day, charge_date,getdate())=0 group by patient_id, times, order_no,group_no ")
+    @Select("select patient_id,times,order_no,group_no from mz_charge_detail c,yp_zd_dict y where c.print_flag=#{printFlag} and c.group_no = '71'" +
+            "        and c.charge_item_code = y.code and c.serial = y.serial and y.class_code != '210100'" +
+            "        and datediff(day, c.charge_date,getdate())=0 group by c.patient_id, c.times, c.order_no,c.group_no")
     List<MzChargeDetail> selectMzPrescriptionByPrintFlag(@Param("printFlag") Integer printFlag);
 }