历史排班

controllers/dialysis_record_api_controller.go

@@ -412,6 +412,9 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 	lastDryWeightDislysis, getDryErr := service.GetLastDryWeight(adminInfo.CurrentOrgId, patientID)
 
 	lastOrder, _ := service.GetLastDilysisOrder(adminInfo.CurrentOrgId, patientID, date.Unix())
+
+	//统计表
+	dryWeightList, _ := service.GetPatientDryWeight(adminInfo.CurrentOrgId, patientID)
 	if getDryErr != nil {
 		this.ErrorLog("获取最后一条干体重失败:%v", getDryErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -466,6 +469,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"information":                 information,
 			"is_advice_open":              adviceConfig,
 			"lastOrder":                   lastOrder,
+			"dryWeightList":               dryWeightList,
 		}
 		this.ServeSuccessJSON(returnData)
 
@@ -503,6 +507,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"information":                 information,
 			"is_advice_open":              adviceConfig,
 			"lastOrder":                   lastOrder,
+			"dryWeightList":               dryWeightList,
 		}
 		this.ServeSuccessJSON(returnData)
 	}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1075,6 +1075,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			item.ExecutionState = 1
 			item.ExecutionStaff = adminInfo.AdminUser.Id
 			item.ExecutionTime = theTime.Unix()
+			item.IsMobile = 1
 			err = service.SaveHisDoctorAdvice(item)
 			key := strconv.FormatInt(adminInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
@@ -1171,18 +1172,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 
 						if medical.IsUse == 1 {
-							drugError := models.XtDrugError{
-								UserOrgId:  adminInfo.Org.Id,
-								DrugId:     item.DrugId,
-								RecordDate: item.AdviceDate,
-								PatientId:  item.PatientId,
-								Remark:     "零用药品",
-								Status:     1,
-								Ctime:      time.Now().Unix(),
-								Mtime:      0,
-							}
-							service.CreateDrugError(drugError)
+
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+								drugError := models.XtDrugError{
+									UserOrgId:             adminInfo.Org.Id,
+									DrugId:                item.DrugId,
+									RecordDate:            item.AdviceDate,
+									PatientId:             item.PatientId,
+									Remark:                "零用药品库存不足",
+									Status:                1,
+									Ctime:                 time.Now().Unix(),
+									Mtime:                 0,
+									SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+									Prescribingnumber:     advice.PrescribingNumber,
+									PrescribingNumberUnit: advice.PrescribingNumberUnit,
+								}
+								service.CreateDrugError(drugError)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 									"advice": advice,
@@ -1192,18 +1197,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 						}
 						if medical.IsUse != 1 {
-							drugError := models.XtDrugError{
-								UserOrgId:  adminInfo.Org.Id,
-								DrugId:     item.DrugId,
-								RecordDate: item.AdviceDate,
-								PatientId:  item.PatientId,
-								Remark:     "药品库存不足",
-								Status:     1,
-								Ctime:      time.Now().Unix(),
-								Mtime:      0,
-							}
-							service.CreateDrugError(drugError)
+
 							if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
+								drugError := models.XtDrugError{
+									UserOrgId:             adminInfo.Org.Id,
+									DrugId:                item.DrugId,
+									RecordDate:            item.AdviceDate,
+									PatientId:             item.PatientId,
+									Remark:                "药品库存不足",
+									Status:                1,
+									Ctime:                 time.Now().Unix(),
+									Mtime:                 0,
+									SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+									Prescribingnumber:     advice.PrescribingNumber,
+									PrescribingNumberUnit: advice.PrescribingNumberUnit,
+								}
+								service.CreateDrugError(drugError)
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "3",
 									"advice": advice,
@@ -1213,14 +1222,17 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							}
 							if prescribing_number_total > total {
 								drugError := models.XtDrugError{
-									UserOrgId:  adminInfo.Org.Id,
-									DrugId:     item.DrugId,
-									RecordDate: item.AdviceDate,
-									PatientId:  item.PatientId,
-									Remark:     "出库数量大于库存",
-									Status:     1,
-									Ctime:      time.Now().Unix(),
-									Mtime:      0,
+									UserOrgId:             adminInfo.Org.Id,
+									DrugId:                item.DrugId,
+									RecordDate:            item.AdviceDate,
+									PatientId:             item.PatientId,
+									Remark:                "出库数量大于库存",
+									Status:                1,
+									Ctime:                 time.Now().Unix(),
+									Mtime:                 0,
+									SumCount:              list.Count*medical.MinNumber + list.StockMinNumber,
+									Prescribingnumber:     advice.PrescribingNumber,
+									PrescribingNumberUnit: advice.PrescribingNumberUnit,
 								}
 								service.CreateDrugError(drugError)
 								c.ServeSuccessJSON(map[string]interface{}{
@@ -3808,13 +3820,12 @@ func (c *PatientApiController) CreateGroupAdvice() {
 				}
 			}
 
-			fmt.Println("admin==================", adminUserInfo.Org.Id)
 			//长沙南雅
 			if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 {
 
 				//查询该患者今日有没有双人核对
 				check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.Org.Id, patientInfo.ID, RecordDate)
-				fmt.Println("check----------------", check)
+
 				if check.ID > 0 {
 					advice.Checker = check.Modifier
 					advice.CheckState = 1

models/drug_stock.go

@@ -711,15 +711,18 @@ func (DrugWarehouseOutInfoNight) TableName() string {
 }
 
 type XtDrugError struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	DrugId     int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
-	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Remark     string `gorm:"column:remark" json:"remark" form:"remark"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime      int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	ID                    int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	RecordDate            int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId             int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Remark                string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Prescribingnumber     float64 `gorm:"column:prescribingnumber" json:"prescribingnumber" form:"prescribingnumber"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	SumCount              int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 }
 
 func (XtDrugError) TableName() string {

models/his_models.go

@@ -261,6 +261,7 @@ type HisDoctorAdviceInfo struct {
 	ExecutionFrequencyId  int64                  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
 	Child                 []*HisDoctorAdviceInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
 	IsSettle              int64                  `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
+	IsMobile              int64                  `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/mobile_dialysis_service.go

@@ -7236,3 +7236,10 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 
 	return vms, err
 }
+
+func GetPatientDryWeight(org_id int64, patient_id int64) (weight []*models.XtPatientDryweight, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and status =1", org_id, patient_id).Find(&weight).Error
+
+	return weight, err
+}

service/new_warehouse_service.go

@@ -1261,6 +1261,20 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 // 药品自动出库 递归方式
 func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
 
+	drugError := models.XtDrugError{
+		UserOrgId:             orgID,
+		DrugId:                advice.DrugId,
+		RecordDate:            advice.AdviceDate,
+		PatientId:             advice.PatientId,
+		Remark:                "进入出库页面",
+		Status:                1,
+		Ctime:                 time.Now().Unix(),
+		Mtime:                 0,
+		SumCount:              0,
+		Prescribingnumber:     advice.PrescribingNumber,
+		PrescribingNumberUnit: advice.PrescribingNumberUnit,
+	}
+	CreateDrugError(drugError)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -1306,28 +1320,39 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
-
+		drugError := models.XtDrugError{
+			UserOrgId:             orgID,
+			DrugId:                advice.DrugId,
+			RecordDate:            advice.AdviceDate,
+			PatientId:             advice.PatientId,
+			Remark:                "查询库存报错",
+			Status:                1,
+			Ctime:                 time.Now().Unix(),
+			Mtime:                 0,
+			SumCount:              0,
+			Prescribingnumber:     advice.PrescribingNumber,
+			PrescribingNumberUnit: advice.PrescribingNumberUnit,
+		}
+		CreateDrugError(drugError)
 		return err
 	}
-	// 将该批次的剩余库存数量转换为拆零数量
+
 	// 将该批次的剩余库存数量转换为拆零数量
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
-		//fmt.Println("进来1")
+
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-		//fmt.Println("剩余库存1", stock_number)
+
 	}
 	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
-		//fmt.Println("进来2")
+
 		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
-		//fmt.Println("剩余库存2", stock_number)
+
 	}
 	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
-		//fmt.Println("进来3")
+
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-		//fmt.Println("剩余库存3", stock_number)
+
 	}
-	//fmt.Println("剩余库存23333333333333333333333333333wo", stock_number)
-	//fmt.Println("出库数量2333333333333333333333333333333333333wo", deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -1367,10 +1392,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		warehouse.Mtime = time.Now().Unix()
 
-		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
-		fmt.Println("max_number232232332232322wo", maxNumber)
-		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
-
 		if warehouse.StockMinNumber < minNumber {
 
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
@@ -1416,6 +1437,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		//扣减库存数据
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
+			drugError := models.XtDrugError{
+				UserOrgId:             orgID,
+				DrugId:                advice.DrugId,
+				RecordDate:            advice.AdviceDate,
+				PatientId:             advice.PatientId,
+				Remark:                "扣减库存失败",
+				Status:                1,
+				Ctime:                 time.Now().Unix(),
+				Mtime:                 0,
+				SumCount:              0,
+				Prescribingnumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			}
+			CreateDrugError(drugError)
 			return errThree
 		}
 
@@ -1464,6 +1499,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		if lastDrugOutInfo.ID == 0 {
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建出库单失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
 				return errOne
 			}
 		}
@@ -1478,6 +1527,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			if deliver_number != his_count {
 				errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
 				if errThree != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "更新出库单失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 					return errThree
 				}
 			}
@@ -1497,12 +1560,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
-		//fmt.Println("deliver_number", deliver_number)
-		//fmt.Println("out_count", out_count)
-		//fmt.Println("cancel_count", cancel_count)
-		//
-		//fmt.Println("出库数据", deliver_number)
-		//fmt.Println("出库流水---------------------", out_count, cancel_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number >= (out_count - cancel_count) {
 			drugflow := models.DrugFlow{
@@ -1536,9 +1593,43 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 			}
 
-			CreateDrugFlowOne(drugflow)
+			errThreeTy := CreateDrugFlowOne(drugflow)
+
+			if errThreeTy != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建流水失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 			//出库数量相加
-			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+			errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+
+			if errThreeTys != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "出库数量相加失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 
 		}
 
@@ -1570,7 +1661,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			_, errCode := FindDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 			if errCode == gorm.ErrRecordNotFound {
-				AddSigleDrugCancelStock(&cancelStock)
+				errCode := AddSigleDrugCancelStock(&cancelStock)
+				if errCode != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "创建退库单失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
+				}
 			}
 			lastDrugCancelStock, _ := FindLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 
@@ -1602,7 +1709,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				StorehouseId:     storeConfig.DrugStorehouseOut,
 				IsCheck:          1,
 			}
-			CreatedCancelStock(cancelStockInfo)
+			errCodes := CreatedCancelStock(cancelStockInfo)
+			if errCodes != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建退库单失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 			flow := models.DrugFlow{
 				WarehousingId:           warehouse.ID,
 				DrugId:                  warehouse.DrugId,
@@ -1640,9 +1763,57 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
 			}
-			CreateDrugFlowOne(flow)
-			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
-			ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			errCodeflow := CreateDrugFlowOne(flow)
+			if errCodeflow != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "退库流水创建失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+			errCodesum := AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
+			if errCodesum != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "增加退库数量失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+			errCodereduce := ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			if errCodereduce != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "减少出库数量失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 		}
 
 		//查询是否存在数据
@@ -1664,6 +1835,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 		errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 		if errTwo != nil {
+			drugError := models.XtDrugError{
+				UserOrgId:             orgID,
+				DrugId:                advice.DrugId,
+				RecordDate:            advice.AdviceDate,
+				PatientId:             advice.PatientId,
+				Remark:                "新增自动出库表失败",
+				Status:                1,
+				Ctime:                 time.Now().Unix(),
+				Mtime:                 0,
+				SumCount:              0,
+				Prescribingnumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			}
+			CreateDrugError(drugError)
 			return errTwo
 		}
 		return nil
@@ -1705,6 +1890,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
 
 		if errThree != nil {
+			drugError := models.XtDrugError{
+				UserOrgId:             orgID,
+				DrugId:                advice.DrugId,
+				RecordDate:            advice.AdviceDate,
+				PatientId:             advice.PatientId,
+				Remark:                "第二批次扣减库存失败",
+				Status:                1,
+				Ctime:                 time.Now().Unix(),
+				Mtime:                 0,
+				SumCount:              0,
+				Prescribingnumber:     advice.PrescribingNumber,
+				PrescribingNumberUnit: advice.PrescribingNumberUnit,
+			}
+			CreateDrugError(drugError)
 			return errThree
 		}
 		//查询剩余库存
@@ -1749,9 +1948,22 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		//查询是否存在出库数据
 		_, errCode := GetSigleDrugWarehouseOutInfo(advice.PatientId, advice.AdviceDate, orgID)
 		if errCode == gorm.ErrRecordNotFound {
-			fmt.Println("j你俩3233223323232323233wo")
 			errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "创建出库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
 				return errOne
 			}
 		}
@@ -1768,6 +1980,20 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			if deliver_number != his_count {
 				errThree := UpdateSingleDrugWarehouseOutInfoSix(advice.PatientId, advice.AdviceDate, orgID, warehouseOutInfo, advice.ID)
 				if errThree != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "更新出库表失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 					return errThree
 				}
 			}
@@ -1795,11 +2021,42 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		if errcodeThree == gorm.ErrRecordNotFound {
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次新增自动出库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
 				return errTwo
 			}
 		}
 		if errcodeThree == nil {
-			UpdateDrugAutoReduceRecordInfo(advice.PatientId, advice.RecordDate, advice.DrugId, details)
+			errThreeauto := UpdateDrugAutoReduceRecordInfo(advice.PatientId, advice.RecordDate, advice.DrugId, details)
+			if errThreeauto != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次更新自动出库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+
 		}
 
 		var out_count int64
@@ -1855,9 +2112,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 		}
 
-		fmt.Println("libai", out_count)
-		fmt.Println("cancel", cancel_count)
-		fmt.Println("deliver_number", deliver_number)
 		if deliver_number < (out_count - cancel_count) {
 			operation_time := time.Now().Unix()
 
@@ -1884,7 +2138,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			_, errCode := FindDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 			if errCode == gorm.ErrRecordNotFound {
-				AddSigleDrugCancelStock(&cancelStock)
+				errCodeCancel := AddSigleDrugCancelStock(&cancelStock)
+				if errCodeCancel != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "第二批次新增流水表失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
+				}
 			}
 			lastDrugCancelStock, _ := FindLastDrugCancelStock(advice.AdviceDate, advice.UserOrgId)
 
@@ -1916,7 +2186,23 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				StorehouseId:     storeConfig.DrugStorehouseOut,
 				IsCheck:          1,
 			}
-			CreatedCancelStock(cancelStockInfo)
+			errCodeCancel := CreatedCancelStock(cancelStockInfo)
+			if errCodeCancel != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次创建自动退库表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 			flow := models.DrugFlow{
 				WarehousingId:           warehouse.ID,
 				DrugId:                  warehouse.DrugId,
@@ -1954,11 +2240,59 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				LastPrice:               warehouse.Price,
 				OverCount:               sum_count,
 			}
-			CreateDrugFlowOne(flow)
+			errCodeFlows := CreateDrugFlowOne(flow)
+			if errCodeFlows != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次创建自动退库流水表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 
 			//退库数量增加
-			AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
-			ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			errCodeFlows = AddCancelSumCountOne(storeConfig.DrugStorehouseOut, advice.DrugId, advice.UserOrgId, flow.Count)
+			if errCodeFlows != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次创建自动退库流水表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
+			errCodereduce := ReduceDrugCountTwo(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, flow.Count)
+			if errCodereduce != nil {
+				drugError := models.XtDrugError{
+					UserOrgId:             orgID,
+					DrugId:                advice.DrugId,
+					RecordDate:            advice.AdviceDate,
+					PatientId:             advice.PatientId,
+					Remark:                "第二批次减少库存表失败",
+					Status:                1,
+					Ctime:                 time.Now().Unix(),
+					Mtime:                 0,
+					SumCount:              0,
+					Prescribingnumber:     advice.PrescribingNumber,
+					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				}
+				CreateDrugError(drugError)
+			}
 		}
 
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作

service/warhouse_service.go

@@ -483,6 +483,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 	// 2.判断当天当前机构有没有创建出库单，没有则创建
 	// 3.创建出库流程
 	// 3.1 实现先进先出逻辑 由于药品执行后，不可以修改和删除，所以不考虑出库后的退库和修改出库数量等
+
 	isHasWay := false
 	record_time := int64(0)
 	isHasWay = true
@@ -491,6 +492,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 	if isHasWay {
 		//判断当天当前机构有没有创建出库单，没有则创建
 		out, err := FindDrugStockOutByIsSys(orgID, 1, record_time)
+
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		if err == gorm.ErrRecordNotFound {
 			timeStr := time.Now().Format("2006-01-02")