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

发药更新优化

See merge request lihong/thmz_system!69

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

@@ -992,11 +992,6 @@ public interface MzPharmacyMapper {
      */
     @Update("UPDATE mz_charge_detail " +
             " SET confirm_flag = '1'," +
-            " print_flag_yj =" +
-            " CASE" +
-            " WHEN print_flag_yj = '1' THEN" +
-            " '2' ELSE print_flag_yj " +
-            " END," +
             " confirm_time = #{confirmTime}," +
             " confirm_id = #{confirmId} " +
             " WHERE" +
@@ -1004,7 +999,7 @@ public interface MzPharmacyMapper {
             " AND times = #{times} " +
             " AND order_no = #{orderNo} " +
             " AND group_no = #{groupNo} " +
-            " AND ( IsNull( confirm_flag, '0' ) IN ( '0', '2','5' ) OR print_flag_yj = '1' ) ")
+            " AND isnull( confirm_flag, '0' ) IN ( '0', '2','5' ) ")
     int updateFyclChargeDetailConfirmFlag(MzChargeDetail mzChargeDetail);
 
     /**