commit

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -2034,13 +2034,13 @@ public class MzPharmacyController {
                     tracCodgQuery.setPatientId((String) item.get("patient_id"));
                     // 处理类型转换，支持 Short 和 Integer 两种类型
                     Object timesObj = item.get("times");
-                    Object receiptNoObj = item.get("receipt_no");
-                    Object orderNoObj = item.get("order_no");
+                    Object itemReceiptNoObj = item.get("receipt_no");
+                    Object itemOrderNoObj = item.get("order_no");
                     Object itemNoObj = item.get("item_no");
                     
                     tracCodgQuery.setTimes(timesObj instanceof Short ? ((Short) timesObj).intValue() : (Integer) timesObj);
-                    tracCodgQuery.setReceiptNo(receiptNoObj instanceof Short ? ((Short) receiptNoObj).intValue() : (Integer) receiptNoObj);
-                    tracCodgQuery.setOrderNo(orderNoObj instanceof Short ? ((Short) orderNoObj).intValue() : (Integer) orderNoObj);
+                    tracCodgQuery.setReceiptNo(itemReceiptNoObj instanceof Short ? ((Short) itemReceiptNoObj).intValue() : (Integer) itemReceiptNoObj);
+                    tracCodgQuery.setOrderNo(itemOrderNoObj instanceof Short ? ((Short) itemOrderNoObj).intValue() : (Integer) itemOrderNoObj);
                     tracCodgQuery.setChargeItemCode((String) item.get("charge_item_code"));
                     tracCodgQuery.setSerial((String) item.get("serial"));
                     tracCodgQuery.setItemNo(itemNoObj instanceof Short ? ((Short) itemNoObj).intValue() : (Integer) itemNoObj);
@@ -2066,8 +2066,8 @@ public class MzPharmacyController {
                     SelinfoSold selinfoSold = new SelinfoSold();
                     selinfoSold.setPatientId((String) item.get("patient_id"));
                     selinfoSold.setTimes(timesObj instanceof Short ? ((Short) timesObj).intValue() : (Integer) timesObj);
-                    selinfoSold.setReceiptNo(receiptNoObj instanceof Short ? ((Short) receiptNoObj).intValue() : (Integer) receiptNoObj);
-                    selinfoSold.setOrderNo(orderNoObj instanceof Short ? ((Short) orderNoObj).intValue() : (Integer) orderNoObj);
+                    selinfoSold.setReceiptNo(itemReceiptNoObj instanceof Short ? ((Short) itemReceiptNoObj).intValue() : (Integer) itemReceiptNoObj);
+                    selinfoSold.setOrderNo(itemOrderNoObj instanceof Short ? ((Short) itemOrderNoObj).intValue() : (Integer) itemOrderNoObj);
                     selinfoSold.setChargeItemCode((String) item.get("charge_item_code"));
                     // 处理 realNo 的类型转换
                     Object realNoObj = item.get("real_no");