Merge branch 'dev-1.1.4' into 'dev-1.1.4'

门诊处方打印修复

See merge request lihong/thmz_system!104

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

@@ -878,7 +878,7 @@ public interface MzChargeDetailMapper {
             " (case when y.class_code = '210100' then 1 else 0 end ) as is_hide,c.print_flag,c.drug_win,cy_jssm,cy_mtjs,cy_jsl,cy_zql,cy_fj,cy_ffcs,cy_fysm,rtrim(cy_dj)cy_dj" +
             "    FROM mz_charge_detail c WITH(NOLOCK) ,yp_zd_dict y WITH(NOLOCK) " +
             " where  1=1 " +
-            " and c.charge_item_code = y.code and c.serial = y.serial" +
+            " and c.charge_item_code = y.code and c.serial = y.serial and c.pay_mark = '0' " +
             "<when test='patientId!=null'>" +
             " and c.patient_id =#{patientId}" +
             "</when>" +