Merge branch 'master' into 淮海科技

src/main/java/thyyxxk/webserver/dao/his/orderZdMaintain/OrderZdMaintainDao.java

@@ -346,7 +346,8 @@ public interface OrderZdMaintainDao {
     List<ZdChargeClass> getZdChargeClassByYzClass(List<String>  yzClassCodeList);
 
     @Select("select code,name,charge_amount,exec_unit,py_code " +
-            "from zd_charge_item where class_code=#{classCode}")
+            "from zd_charge_item where class_code=#{classCode} " +
+            "and code not in (select occ_code from yz_order_occurence)")
     List<ZdChargeItem> getZdChargeItemByClassCode(String classCode);
 
     @Insert("<script>" +