Bladeren bron

押金管理bug修改

mainqaq 3 jaren geleden
bovenliggende
commit
8085f6ffbe
1 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 4 4
      controllers/his_api_controller.go

+ 4 - 4
controllers/his_api_controller.go Bestand weergeven

4602
 
4602
 
4603
 			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
4603
 			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
4604
 
4604
 
4605
-				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
4605
+				prescriptions, _ = service.GetPrescriptionByIdsTX(ids_arr, adminUser.CurrentOrgId, tx)
4606
 			} else {
4606
 			} else {
4607
-				prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
4607
+				prescriptions, _ = service.GetSettleHisPrescriptionTX(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type, tx)
4608
 			}
4608
 			}
4609
 		} else { //月结
4609
 		} else { //月结
4610
 
4610
 
4626
 			}
4626
 			}
4627
 			recordEndTime := theEndTime.Unix()
4627
 			recordEndTime := theEndTime.Unix()
4628
 			end_time = recordEndTime
4628
 			end_time = recordEndTime
4629
-			prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type)
4629
+			prescriptions, _ = service.GetMonthHisPrescriptionTX(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type, tx)
4630
 		}
4630
 		}
4631
 
4631
 
4632
 		timestamp := time.Now().Unix()
4632
 		timestamp := time.Now().Unix()
4701
 			PType:                 2,
4701
 			PType:                 2,
4702
 			SetlTime:              tm.Format("2006-01-02 15:04:05"),
4702
 			SetlTime:              tm.Format("2006-01-02 15:04:05"),
4703
 		}
4703
 		}
4704
-		err = service.CreateOrder(order)
4704
+		err = service.CreateOrderTX(order, tx)
4705
 		if err != nil {
4705
 		if err != nil {
4706
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
4706
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
4707
 			return
4707
 			return