押金管理bug修改

controllers/his_api_controller.go

@@ -4602,9 +4602,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 
-				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+				prescriptions, _ = service.GetPrescriptionByIdsTX(ids_arr, adminUser.CurrentOrgId, tx)
 			} else {
-				prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
+				prescriptions, _ = service.GetSettleHisPrescriptionTX(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type, tx)
 			}
 		} else { //月结
 
@@ -4626,7 +4626,7 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			recordEndTime := theEndTime.Unix()
 			end_time = recordEndTime
-			prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type)
+			prescriptions, _ = service.GetMonthHisPrescriptionTX(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type, tx)
 		}
 
 		timestamp := time.Now().Unix()
@@ -4701,7 +4701,7 @@ func (c *HisApiController) GetUploadInfo() {
 			PType:                 2,
 			SetlTime:              tm.Format("2006-01-02 15:04:05"),
 		}
-		err = service.CreateOrder(order)
+		err = service.CreateOrderTX(order, tx)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
 			return