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/MzPharmacyMapper.java

@@ -667,9 +667,10 @@ public interface MzPharmacyMapper {
             "         a.times     =#{times} and" +
             "         a.receipt_no=#{receiptNo} and" +
             "         a.order_no =#{orderNo}   and" +
-            "         a.charge_item_code *=b.charge_code and " +
-            "         a.serial     *=b.serial and " +
-            "         b.group_no   =#{groupNo} and  " +
+            "         a.charge_item_code =b.charge_code and " +
+            "         a.serial   =b.serial and " +
+            "         b.group_no =#{groupNo} and  " +
+            "         b.group_no =a.group_no and  " +
             "         a.bill_item_code <![CDATA[<>]]>'TC'and" +
             "         a.charge_item_code=c.code and" +
             "         a.serial=c.serial and" +