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

药品分装组合问题修复

See merge request hurugang/thmz_system!6

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpBaseYfMapper.java

@@ -219,7 +219,8 @@ public interface YpBaseYfMapper {
             "   on a.charge_code = b.code " +
             "   and a.serial = b.serial " +
             "   and a.group_no = #{groupNo} " +
-            "   WHERE b.code = #{chargeCode}  ")
+            "   WHERE b.code = #{chargeCode} " +
+            "   and isnull(b.del_flag,0) != 1 ")
     List<YpBaseYfVo> selectYpByChargeCodeAndGroupNo(@Param("chargeCode") String chargeCode, @Param("groupNo") String groupNo);
 
     /**