耗材参数

controllers/gobal_config_api_controller.go

 	beego.Router("/api/drug/getautodrugdetial", &GobalConfigApiController{}, "Get:GetAutoDrugDetail")
 	beego.Router("/api/drug/getdrugorderinprint", &GobalConfigApiController{}, "Get:GetDrugOrderInPrint")
 	beego.Router("/api/drug/getdrugoutorderdetailprint", &GobalConfigApiController{}, "Get:GetDrugOutOrderPrint")
+	beego.Router("/api/drug/getdrugbatchnumber", &GobalConfigApiController{}, "Get:GetDrugBatchNumber")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 
 	outList, total, err := service.GetDrugStockOutFlow(drug_id, startTime, endTime, page, limit, orgId, stock_type)
-
+	fmt.Println("outList22233333333333333333333", outList)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	id, _ := c.GetInt64("id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetSingleOrderDetail(id, orgId)
+	outList, err := service.GetAllSingleDrugDetail(id, orgId)
 	dealerList, err := service.GetAllDealerList(orgId)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	if err != nil {
 		"list":             list,
 		"dealerList":       dealerList,
 		"manufacturerList": manufacturerList,
+		"outList":          outList,
 	})
 }
 
 func (c *GobalConfigApiController) GetAutoDrugDetail() {
 
+	warehouse_out_id, _ := c.GetInt64("warehouse_out_id")
 	id, _ := c.GetInt64("drug_id")
 	record_time, _ := c.GetInt64("record_time")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
+	//获取自动出库
 	list, err, total := service.FindDrugStockUserDetailByIdThree(id, record_time, orgId)
+	//获取手动出库
+	outList, err := service.FindeDrugWarehouserInfo(warehouse_out_id, id, orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":  list,
-		"total": total,
+		"list":    list,
+		"total":   total,
+		"outList": outList,
 	})
 }
 
 		"manufacturerList": manufacturerList,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugBatchNumber() {
+
+	id, _ := c.GetInt64("id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetDrugBatchNumber(id, orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

controllers/manager_center_api_controller.go

 	good_kind, _ := c.GetInt64("good_kind", 0)
 	medical_insurance_level, _ := c.GetInt64("medical_insurance_level", 0)
 	retail_price, _ := c.GetFloat("retail_price", 0)
+	fmt.Println(retail_price)
 	medical_insurance_number := c.GetString("medical_insurance_number")
 	is_special_diseases, _ := c.GetInt64("is_special_diseases", 0)
 	is_record, _ := c.GetInt64("is_record")
 		Agent:                       agent,
 		GoodNumber:                  good_number,
 		MedicalInsuranceLevel:       medical_insurance_level,
-		RetailPrice:                 retail_price,
+		RetailPrice:                 packing_price,
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		ProductionType:              production_type,
 		SpecialMedical:              special_medical,
 	good_kind, _ := c.GetInt64("good_kind", 0)
 	medical_insurance_level, _ := c.GetInt64("medical_insurance_level", 0)
 	retail_price, _ := c.GetFloat("retail_price", 0)
+	fmt.Println(retail_price)
 	medical_insurance_number := c.GetString("medical_insurance_number")
 	is_special_diseases, _ := c.GetInt64("is_special_diseases", 0)
 	is_record, _ := c.GetInt64("is_record")
 		Agent:                       agent,
 		GoodNumber:                  good_number,
 		MedicalInsuranceLevel:       medical_insurance_level,
-		RetailPrice:                 retail_price,
+		RetailPrice:                 packing_price,
 		SpecialMedical:              special_medical,
 		SocialSecurityDirectoryCode: social_security_directory_code,
 		ProductionType:              production_type,

controllers/mobile_api_controllers/patient_api_controller.go

 				if isHasWay {
 					for _, item := range advices {
 						if item.Way == 1 {
+							//查询该药品是否有库存
+							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+							if list.Count == 0 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
+							if count > list.Count {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "2",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
 							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 						}
 					}
 				if isHasWay {
 					for _, item := range advices {
 						if item.Way == 1 {
+							//查询该药品是否有库存
+							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+							//获取该药品的信息
+							//medical, _ := service.GetBaseDrugMedical(item.DrugId)
+							prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+							count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+
+							if list.Count == 0 {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "1",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
+							if count > list.Count {
+								c.ServeSuccessJSON(map[string]interface{}{
+									"msg":    "2",
+									"advice": advice,
+									"ids":    ids,
+								})
+								return
+							}
 							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 						}
 					}
 		if err == nil {
 			//药品管理信息
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
-			fmt.Println("drugstockconfig000000000000000000000000", drugStockConfig.IsOpen)
 			if drugStockConfig.IsOpen == 1 {
 				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
+				//查询该药品是否有库存
+				list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				if list.Count == 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
+				if count > list.Count {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "2",
+						"advice": advice,
+						"ids":    ids,
+					})
+					return
+				}
+
 				service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 			}
 			c.ServeSuccessJSON(map[string]interface{}{

controllers/patient_api_controller.go

 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
 
 		if drugStockConfig.IsOpen == 1 {
-			//查询已经执行的医嘱
-			//advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
-			//for _, item := range advices {
-			//
-			//	//调用药品出库接口
-			//	//service.DrugsDelivery(item.UserOrgId, item)
-			//
-			//	//if item.Way == 1 {
-			//	//	out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
-			//	//	if err == gorm.ErrRecordNotFound {
-			//	//		//没有记录，则创建出库单
-			//	//		timeStr := time.Now().Format("2006-01-02")
-			//	//		timeArr := strings.Split(timeStr, "-")
-			//	//		total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
-			//	//		total = total + 1
-			//	//		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-			//	//		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-			//	//		number = number + total
-			//	//		warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-			//	//		creater := adminUserInfo.AdminUser.Id
-			//	//		warehouseOut := models.DrugWarehouseOut{
-			//	//			WarehouseOutOrderNumber: warehousing_out_order,
-			//	//			OperationTime:           time.Now().Unix(),
-			//	//			OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//			Creater:                 creater,
-			//	//			Ctime:                   time.Now().Unix(),
-			//	//			Status:                  1,
-			//	//			WarehouseOutTime:        item.RecordDate,
-			//	//			Dealer:                  0,
-			//	//			Manufacturer:            0,
-			//	//			Type:                    1,
-			//	//			IsSys:                   1,
-			//	//		}
-			//	//
-			//	//		err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-			//	//		if err != nil {
-			//	//			utils.TraceLog("创建出库单失败 err = %v", err)
-			//	//		} else {
-			//	//			if item.Way == 1 {
-			//	//				if item.PrescribingNumber > 0 {
-			//	//					warehouseOutInfo := &models.DrugWarehouseOutInfo{
-			//	//						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			//	//						WarehouseOutId:          warehouseOut.ID,
-			//	//						Status:                  1,
-			//	//						Ctime:                   time.Now().Unix(),
-			//	//						Remark:                  "",
-			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//						Type:                    1,
-			//	//						Manufacturer:            0,
-			//	//						Dealer:                  0,
-			//	//						IsSys:                   1,
-			//	//						SysRecordTime:           item.RecordDate,
-			//	//						DrugId:                  item.DrugId,
-			//	//					}
-			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-			//	//					warehouseOutInfo.Count = count
-			//	//					stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-			//	//					warehouseOutInfo.Price = stockInInfo.Price
-			//	//					err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-			//	//					if err == nil {
-			//	//						details := &models.DrugAutomaticReduceDetail{
-			//	//							WarehouseOutId:          warehouseOutInfo.ID,
-			//	//							WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-			//	//							PatientId:               item.PatientId,
-			//	//							Ctime:                   time.Now().Unix(),
-			//	//							Mtime:                   time.Now().Unix(),
-			//	//							Status:                  1,
-			//	//							RecordTime:              item.RecordDate,
-			//	//							OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//							DrugId:                  item.DrugId,
-			//	//							Count:                   count,
-			//	//						}
-			//	//						service.AddSigleDrugAutoReduceRecordInfo(details)
-			//	//						if err != nil {
-			//	//							utils.TraceLog("创建出库单失败 err = %v", err)
-			//	//						} else {
-			//	//							if item.Way == 1 {
-			//	//								if item.PrescribingNumber > 0 {
-			//	//									warehouseOutInfo := &models.DrugWarehouseOutInfo{
-			//	//										WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-			//	//										WarehouseOutId:          warehouseOut.ID,
-			//	//										Status:                  1,
-			//	//										Ctime:                   time.Now().Unix(),
-			//	//										Remark:                  "",
-			//	//										OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//										Type:                    1,
-			//	//										Manufacturer:            0,
-			//	//										Dealer:                  0,
-			//	//										IsSys:                   1,
-			//	//										SysRecordTime:           item.RecordDate,
-			//	//										DrugId:                  item.DrugId,
-			//	//									}
-			//	//									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//	//									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-			//	//									warehouseOutInfo.Count = count
-			//	//									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-			//	//									warehouseOutInfo.Price = stockInInfo.Price
-			//	//									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-			//	//									if err == nil {
-			//	//										details := &models.DrugAutomaticReduceDetail{
-			//	//											WarehouseOutId:          warehouseOutInfo.ID,
-			//	//											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-			//	//											PatientId:               item.PatientId,
-			//	//											Ctime:                   time.Now().Unix(),
-			//	//											Mtime:                   time.Now().Unix(),
-			//	//											Status:                  1,
-			//	//											RecordTime:              item.RecordDate,
-			//	//											OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//											DrugId:                  item.DrugId,
-			//	//											Count:                   count,
-			//	//										}
-			//	//										service.AddSigleDrugAutoReduceRecordInfo(details)
-			//	//									}
-			//	//								}
-			//	//							}
-			//	//						}
-			//	//
-			//	//					}
-			//	//				}
-			//	//			}
-			//	//		}
-			//	//	} else if err == nil {
-			//	//		if item.Way == 1 {
-			//	//			outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-			//	//			if err == gorm.ErrRecordNotFound {
-			//	//				warehouseOutInfo := &models.DrugWarehouseOutInfo{
-			//	//					WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-			//	//					WarehouseOutId:          out.ID,
-			//	//					Status:                  1,
-			//	//					Ctime:                   time.Now().Unix(),
-			//	//					Remark:                  "",
-			//	//					OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//					Type:                    1,
-			//	//					Manufacturer:            0,
-			//	//					Dealer:                  0,
-			//	//					IsSys:                   1,
-			//	//					SysRecordTime:           item.RecordDate,
-			//	//				}
-			//	//
-			//	//				stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-			//	//				warehouseOutInfo.Price = stockInInfo.Price
-			//	//				warehouseOutInfo.DrugId = item.DrugId
-			//	//				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//	//				count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-			//	//				warehouseOutInfo.Count = count
-			//	//				err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-			//	//				if err == nil {
-			//	//					details := &models.DrugAutomaticReduceDetail{
-			//	//						WarehouseOutId:          warehouseOutInfo.ID,
-			//	//						WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-			//	//						PatientId:               item.PatientId,
-			//	//						Ctime:                   time.Now().Unix(),
-			//	//						Mtime:                   time.Now().Unix(),
-			//	//						Status:                  1,
-			//	//						RecordTime:              item.RecordDate,
-			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//						DrugId:                  item.DrugId,
-			//	//						Count:                   count,
-			//	//					}
-			//	//					service.AddSigleDrugAutoReduceRecordInfo(details)
-			//	//				}
-			//	//
-			//	//			} else if err == nil { //记录存在，则将增加数量
-			//	//				if outInfo.ID > 0 {
-			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-			//	//					service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
-			//	//				}
-			//	//
-			//	//				count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
-			//	//				if count == 0 {
-			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-			//	//					details := &models.DrugAutomaticReduceDetail{
-			//	//						WarehouseOutId:          outInfo.ID,
-			//	//						WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-			//	//						PatientId:               item.PatientId,
-			//	//						Ctime:                   time.Now().Unix(),
-			//	//						Mtime:                   time.Now().Unix(),
-			//	//						Status:                  1,
-			//	//						RecordTime:              item.RecordDate,
-			//	//						OrgId:                   adminUserInfo.CurrentOrgId,
-			//	//						DrugId:                  item.DrugId,
-			//	//						Count:                   count,
-			//	//					}
-			//	//					service.AddSigleDrugAutoReduceRecordInfo(details)
-			//	//				} else if count == 1 {
-			//	//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-			//	//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-			//	//					service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
-			//	//				}
-			//	//
-			//	//			}
-			//	//		}
-			//	//	}
-			//	//}
-			//}
+
 			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
 				fmt.Println("imte00000000000000", item.PrescribingNumber)
+
+				//查询该药品是否有库存
+				list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				if list.Count == 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+				}
+				if count > list.Count {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "2",
+						"advice": advice,
+					})
+					return
+				}
 				//调用药品出库接口
 				service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
-				//if item.Way == 1 {
-				//	out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
-				//	if err == gorm.ErrRecordNotFound {
-				//		//没有记录，则创建出库单
-				//		timeStr := time.Now().Format("2006-01-02")
-				//		timeArr := strings.Split(timeStr, "-")
-				//		total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
-				//		total = total + 1
-				//		warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-				//		number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-				//		number = number + total
-				//		warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-				//		creater := adminUserInfo.AdminUser.Id
-				//		warehouseOut := models.DrugWarehouseOut{
-				//			WarehouseOutOrderNumber: warehousing_out_order,
-				//			OperationTime:           time.Now().Unix(),
-				//			OrgId:                   adminUserInfo.CurrentOrgId,
-				//			Creater:                 creater,
-				//			Ctime:                   time.Now().Unix(),
-				//			Status:                  1,
-				//			WarehouseOutTime:        item.RecordDate,
-				//			Dealer:                  0,
-				//			Manufacturer:            0,
-				//			Type:                    1,
-				//			IsSys:                   1,
-				//		}
-				//
-				//		err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-				//		if err != nil {
-				//			utils.TraceLog("创建出库单失败 err = %v", err)
-				//		} else {
-				//			if item.Way == 1 {
-				//				if item.PrescribingNumber > 0 {
-				//					warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				//						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				//						WarehouseOutId:          warehouseOut.ID,
-				//						Status:                  1,
-				//						Ctime:                   time.Now().Unix(),
-				//						Remark:                  "",
-				//						OrgId:                   adminUserInfo.CurrentOrgId,
-				//						Type:                    1,
-				//						Manufacturer:            0,
-				//						Dealer:                  0,
-				//						IsSys:                   1,
-				//						SysRecordTime:           item.RecordDate,
-				//						DrugId:                  item.DrugId,
-				//					}
-				//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//					warehouseOutInfo.Count = count
-				//					stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-				//					warehouseOutInfo.Price = stockInInfo.Price
-				//					err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-				//					if err == nil {
-				//						details := &models.DrugAutomaticReduceDetail{
-				//							WarehouseOutId:          warehouseOutInfo.ID,
-				//							WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-				//							PatientId:               item.PatientId,
-				//							Ctime:                   time.Now().Unix(),
-				//							Mtime:                   time.Now().Unix(),
-				//							Status:                  1,
-				//							RecordTime:              item.RecordDate,
-				//							OrgId:                   adminUserInfo.CurrentOrgId,
-				//							DrugId:                  item.DrugId,
-				//							Count:                   count,
-				//						}
-				//						service.AddSigleDrugAutoReduceRecordInfo(details)
-				//						if err != nil {
-				//							utils.TraceLog("创建出库单失败 err = %v", err)
-				//						} else {
-				//							if item.Way == 1 {
-				//								if item.PrescribingNumber > 0 {
-				//									warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				//										WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				//										WarehouseOutId:          warehouseOut.ID,
-				//										Status:                  1,
-				//										Ctime:                   time.Now().Unix(),
-				//										Remark:                  "",
-				//										OrgId:                   adminUserInfo.CurrentOrgId,
-				//										Type:                    1,
-				//										Manufacturer:            0,
-				//										Dealer:                  0,
-				//										IsSys:                   1,
-				//										SysRecordTime:           item.RecordDate,
-				//										DrugId:                  item.DrugId,
-				//									}
-				//									prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//									count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//									warehouseOutInfo.Count = count
-				//									stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-				//									warehouseOutInfo.Price = stockInInfo.Price
-				//									err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-				//									if err == nil {
-				//										details := &models.DrugAutomaticReduceDetail{
-				//											WarehouseOutId:          warehouseOutInfo.ID,
-				//											WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-				//											PatientId:               item.PatientId,
-				//											Ctime:                   time.Now().Unix(),
-				//											Mtime:                   time.Now().Unix(),
-				//											Status:                  1,
-				//											RecordTime:              item.RecordDate,
-				//											OrgId:                   adminUserInfo.CurrentOrgId,
-				//											DrugId:                  item.DrugId,
-				//											Count:                   count,
-				//										}
-				//										service.AddSigleDrugAutoReduceRecordInfo(details)
-				//									}
-				//								}
-				//							}
-				//						}
-				//
-				//					}
-				//				}
-				//			}
-				//		}
-				//	} else if err == nil {
-				//		if item.Way == 1 {
-				//			outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-				//			if err == gorm.ErrRecordNotFound {
-				//				warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				//					WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-				//					WarehouseOutId:          out.ID,
-				//					Status:                  1,
-				//					Ctime:                   time.Now().Unix(),
-				//					Remark:                  "",
-				//					OrgId:                   adminUserInfo.CurrentOrgId,
-				//					Type:                    1,
-				//					Manufacturer:            0,
-				//					Dealer:                  0,
-				//					IsSys:                   1,
-				//					SysRecordTime:           item.RecordDate,
-				//				}
-				//
-				//				stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-				//				warehouseOutInfo.Price = stockInInfo.Price
-				//				warehouseOutInfo.DrugId = item.DrugId
-				//				prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//				count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//				warehouseOutInfo.Count = count
-				//				err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-				//				if err == nil {
-				//					details := &models.DrugAutomaticReduceDetail{
-				//						WarehouseOutId:          warehouseOutInfo.ID,
-				//						WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-				//						PatientId:               item.PatientId,
-				//						Ctime:                   time.Now().Unix(),
-				//						Mtime:                   time.Now().Unix(),
-				//						Status:                  1,
-				//						RecordTime:              item.RecordDate,
-				//						OrgId:                   adminUserInfo.CurrentOrgId,
-				//						DrugId:                  item.DrugId,
-				//						Count:                   count,
-				//					}
-				//					service.AddSigleDrugAutoReduceRecordInfo(details)
-				//				}
-				//
-				//			} else if err == nil { //记录存在，则将增加数量
-				//				if outInfo.ID > 0 {
-				//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//					service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
-				//				}
-				//
-				//				count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
-				//				if count == 0 {
-				//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//					details := &models.DrugAutomaticReduceDetail{
-				//						WarehouseOutId:          outInfo.ID,
-				//						WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-				//						PatientId:               item.PatientId,
-				//						Ctime:                   time.Now().Unix(),
-				//						Mtime:                   time.Now().Unix(),
-				//						Status:                  1,
-				//						RecordTime:              item.RecordDate,
-				//						OrgId:                   adminUserInfo.CurrentOrgId,
-				//						DrugId:                  item.DrugId,
-				//						Count:                   count,
-				//					}
-				//					service.AddSigleDrugAutoReduceRecordInfo(details)
-				//				} else if count == 1 {
-				//					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//					service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
-				//				}
-				//
-				//			}
-				//		}
-				//	}
-				//}
 			}
 		}
 
 			//查询已经执行的医嘱
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
-
+				//查询该药品是否有库存
+				list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+				prescribingNumber_temp := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
+				count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
+				if list.Count == 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "1",
+						"advice": advice,
+					})
+					return
+				}
+				if count > list.Count {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":    "2",
+						"advice": advice,
+					})
+					return
+				}
 				service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-
-				//out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
-				//if err == gorm.ErrRecordNotFound {
-				//	//没有记录，则创建出库单
-				//	timeStr := time.Now().Format("2006-01-02")
-				//	timeArr := strings.Split(timeStr, "-")
-				//	total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.CurrentOrgId)
-				//	total = total + 1
-				//	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-				//	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-				//	number = number + total
-				//	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-				//	creater := adminUserInfo.AdminUser.Id
-				//	warehouseOut := models.DrugWarehouseOut{
-				//		WarehouseOutOrderNumber: warehousing_out_order,
-				//		OperationTime:           time.Now().Unix(),
-				//		OrgId:                   adminUserInfo.CurrentOrgId,
-				//		Creater:                 creater,
-				//		Ctime:                   time.Now().Unix(),
-				//		Status:                  1,
-				//		WarehouseOutTime:        item.RecordDate,
-				//		Dealer:                  0,
-				//		Manufacturer:            0,
-				//		Type:                    1,
-				//		IsSys:                   1,
-				//	}
-				//
-				//	err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-				//	if err != nil {
-				//		utils.TraceLog("创建出库单失败 err = %v", err)
-				//	} else {
-				//		if item.PrescribingNumber > 0 {
-				//			warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				//				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				//				WarehouseOutId:          warehouseOut.ID,
-				//				Status:                  1,
-				//				Ctime:                   time.Now().Unix(),
-				//				Remark:                  "",
-				//				OrgId:                   adminUserInfo.CurrentOrgId,
-				//				Type:                    1,
-				//				Manufacturer:            0,
-				//				Dealer:                  0,
-				//				IsSys:                   1,
-				//				SysRecordTime:           item.RecordDate,
-				//				DrugId:                  item.DrugId,
-				//			}
-				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//			warehouseOutInfo.Count = count
-				//			stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-				//			warehouseOutInfo.Price = stockInInfo.Price
-				//			err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-				//			if err == nil {
-				//				details := &models.DrugAutomaticReduceDetail{
-				//					WarehouseOutId:          warehouseOutInfo.ID,
-				//					WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-				//					PatientId:               item.PatientId,
-				//					Ctime:                   time.Now().Unix(),
-				//					Mtime:                   time.Now().Unix(),
-				//					Status:                  1,
-				//					RecordTime:              item.RecordDate,
-				//					OrgId:                   adminUserInfo.CurrentOrgId,
-				//					DrugId:                  item.DrugId,
-				//					Count:                   count,
-				//				}
-				//				service.AddSigleDrugAutoReduceRecordInfo(details)
-				//				if err != nil {
-				//					utils.TraceLog("创建出库单失败 err = %v", err)
-				//				} else {
-				//					if item.PrescribingNumber > 0 {
-				//						warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				//							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				//							WarehouseOutId:          warehouseOut.ID,
-				//							Status:                  1,
-				//							Ctime:                   time.Now().Unix(),
-				//							Remark:                  "",
-				//							OrgId:                   adminUserInfo.CurrentOrgId,
-				//							Type:                    1,
-				//							Manufacturer:            0,
-				//							Dealer:                  0,
-				//							IsSys:                   1,
-				//							SysRecordTime:           item.RecordDate,
-				//							DrugId:                  item.DrugId,
-				//						}
-				//						prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//						warehouseOutInfo.Count = count
-				//						stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-				//						warehouseOutInfo.Price = stockInInfo.Price
-				//						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-				//						if err == nil {
-				//							details := &models.DrugAutomaticReduceDetail{
-				//								WarehouseOutId:          warehouseOutInfo.ID,
-				//								WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-				//								PatientId:               item.PatientId,
-				//								Ctime:                   time.Now().Unix(),
-				//								Mtime:                   time.Now().Unix(),
-				//								Status:                  1,
-				//								RecordTime:              item.RecordDate,
-				//								OrgId:                   adminUserInfo.CurrentOrgId,
-				//								DrugId:                  item.DrugId,
-				//								Count:                   count,
-				//							}
-				//							service.AddSigleDrugAutoReduceRecordInfo(details)
-				//						}
-				//					}
-				//				}
-				//
-				//			}
-				//		}
-				//	}
-				//} else if err == nil {
-				//	outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.CurrentOrgId, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-				//	if err == gorm.ErrRecordNotFound {
-				//		warehouseOutInfo := &models.DrugWarehouseOutInfo{
-				//			WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-				//			WarehouseOutId:          out.ID,
-				//			Status:                  1,
-				//			Ctime:                   time.Now().Unix(),
-				//			Remark:                  "",
-				//			OrgId:                   adminUserInfo.CurrentOrgId,
-				//			Type:                    1,
-				//			Manufacturer:            0,
-				//			Dealer:                  0,
-				//			IsSys:                   1,
-				//			SysRecordTime:           item.RecordDate,
-				//		}
-				//
-				//		stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.CurrentOrgId)
-				//		warehouseOutInfo.Price = stockInInfo.Price
-				//		warehouseOutInfo.DrugId = item.DrugId
-				//		prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//		count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//		warehouseOutInfo.Count = count
-				//		err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-				//		if err == nil {
-				//			details := &models.DrugAutomaticReduceDetail{
-				//				WarehouseOutId:          warehouseOutInfo.ID,
-				//				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-				//				PatientId:               item.PatientId,
-				//				Ctime:                   time.Now().Unix(),
-				//				Mtime:                   time.Now().Unix(),
-				//				Status:                  1,
-				//				RecordTime:              item.RecordDate,
-				//				OrgId:                   adminUserInfo.CurrentOrgId,
-				//				DrugId:                  item.DrugId,
-				//				Count:                   count,
-				//			}
-				//			service.AddSigleDrugAutoReduceRecordInfo(details)
-				//		}
-				//
-				//	} else if err == nil { //记录存在，则将增加数量
-				//		if outInfo.ID > 0 {
-				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//			service.UpdateDrugStockOutInfoCount2(adminUserInfo.CurrentOrgId, outInfo.ID, count)
-				//		}
-				//
-				//		count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.CurrentOrgId, item.RecordDate, item.DrugId, item.PatientId)
-				//		if count == 0 {
-				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//			details := &models.DrugAutomaticReduceDetail{
-				//				WarehouseOutId:          outInfo.ID,
-				//				WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-				//				PatientId:               item.PatientId,
-				//				Ctime:                   time.Now().Unix(),
-				//				Mtime:                   time.Now().Unix(),
-				//				Status:                  1,
-				//				RecordTime:              item.RecordDate,
-				//				OrgId:                   adminUserInfo.CurrentOrgId,
-				//				DrugId:                  item.DrugId,
-				//				Count:                   count,
-				//			}
-				//			service.AddSigleDrugAutoReduceRecordInfo(details)
-				//		} else if count == 1 {
-				//			prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-				//			count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-				//			service.UpdateDrugUserInfoDetails(item.DrugId, item.RecordDate, adminUserInfo.CurrentOrgId, item.PatientId, count, &outInfo)
-				//		}
-				//
-				//	}
-				//}
 			}
 		}
 		c.ServeSuccessJSON(map[string]interface{}{

controllers/stock_in_api_controller.go

 	beego.Router("/api/stock/getoutexprotlist", &StockManagerApiController{}, "Get:GetOutExprotList")
 	beego.Router("/api/stock/getsinglecancelorder", &StockManagerApiController{}, "Get:GetSingleCancelOrder")
 	beego.Router("/api/stock/getcancelstockorderprint", &StockManagerApiController{}, "Get:GetCancelStockOrderPrint")
+	beego.Router("/api/stock/getstockbatchnumber", &StockManagerApiController{}, "Get:GetStockBatchNumber")
 
 }
 
 	}
 	errs := service.CreateCancelStockInfo(cancelStockInfos)
 
+	for _, item := range cancelStockInfos {
+
+		//查找该耗材是否有出库记录
+		_, errcode := service.GetWarehoureOutOrderInfo(item.GoodId, item.OrgId)
+		if errcode == gorm.ErrRecordNotFound {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "1",
+			})
+			return
+		}
+
+		//统计该耗材的出库数量
+		info, _ := service.GetWarehoureOrderInfoCount(item.GoodId, item.OrgId)
+		if item.Count > info.Count {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "2",
+			})
+			return
+		}
+	}
+
 	// 改变入库单的值
 	for _, item := range cancelStockInfos {
-		fmt.Println("经理俄2433444 我认为侮辱侮辱侮辱侮辱侮辱侮辱我无污染武荣", item.GoodId, item.OrgId)
+
 		//查询该耗材的入库记录
 		list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
 		//调用退库的方法
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"msg": "退库成功",
+		"msg": "3",
 	})
 
 }
 	if types == 1 {
 		list, total, err = service.FindStockInDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer)
 		_, total_price = service.GetStockInDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer)
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"list":        list,
 		endTime = theTime.Unix()
 	}
 	outList, total, _ := service.GetStockOutList(id, orgId, limit, page, startTime, endTime, is_sys)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"outList": outList,
 		"total":   total,
 
 func (this *StockManagerApiController) GetOrderDetailById() {
 
+	id, _ := this.GetInt64("id")
 	good_id, _ := this.GetInt64("good_id")
 	record_time, _ := this.GetInt64("record_time")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-
+	//自动出库
 	userDetails, err, total := service.FindUserDetailByIdOne(good_id, record_time, orgId)
+	//手动出库
+	info, _ := service.GetWarehouseOutInfoById(id, good_id)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  userDetails,
 			"total": total,
+			"info":  info,
 		})
 	} else {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		"list": list,
 	})
 }
+
+func (this *StockManagerApiController) GetStockBatchNumber() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, _ := service.GetStockBatchNumber(id, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/drug_stock.go

 	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	Number                  string  `gorm:"column:number" json:"number" form:"number"`
 	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {

models/self_drug_models.go

 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
 	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {
 	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
 	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	DrugType                int64   `json:"drug_type"`
 	MaxUnit                 string  `json:"max_unit"`
 	MinUnit                 string  `json:"min_unit"`
 	MinNumber               int64   `json:"min_number"`
 	Dose                    float64 `json:"dose"`
 	DoseUnit                string  `json:"dose_unit"`
-	LastPrice               string  `json:"last_price"`
+	LastPrice               float64 `json:"last_price"`
+	MinPrice                float64 `json:"min_price"`
 	DrugName                string  `json:"drug_name"`
-	Number                  string  `json:"number"`
-	BatchNumber             string  `json:"batch_number"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
 }

models/stock_models.go

 }
 
 type AutomaticReduceDetail struct {
-	ID                      int64     `gorm:"column:id" json:"id"`
-	WarehouseOutId          int64     `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
-	WarehouseOutOrderNumber string    `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
-	PatientId               int64     `gorm:"column:patient_id" json:"patient_id"`
-	Ctime                   int64     `gorm:"column:ctime" json:"ctime"`
-	Mtime                   int64     `gorm:"column:mtime" json:"mtime"`
-	Status                  int64     `gorm:"column:status" json:"status"`
-	RecordTime              int64     `gorm:"column:record_time" json:"record_time"`
-	OrgId                   int64     `gorm:"column:org_id" json:"org_id"`
-	GoodId                  int64     `gorm:"column:good_id" json:"good_id"`
-	GoodTypeId              int64     `gorm:"column:good_type_id" json:"good_type_id"`
-	GoodInfo                GoodInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"info"`
-	GoodsType               GoodsType `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
-	Patients                Patients  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
-	Count                   int64     `gorm:"column:count" json:"count"`
-	Type                    int64     `gorm:"column:type" json:"type"`
+	ID                      int64               `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64               `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseOutOrderNumber string              `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	PatientId               int64               `gorm:"column:patient_id" json:"patient_id"`
+	Ctime                   int64               `gorm:"column:ctime" json:"ctime"`
+	Mtime                   int64               `gorm:"column:mtime" json:"mtime"`
+	Status                  int64               `gorm:"column:status" json:"status"`
+	RecordTime              int64               `gorm:"column:record_time" json:"record_time"`
+	OrgId                   int64               `gorm:"column:org_id" json:"org_id"`
+	GoodId                  int64               `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64               `gorm:"column:good_type_id" json:"good_type_id"`
+	GoodInfo                GoodInfo            `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"info"`
+	GoodsType               GoodsType           `gorm:"ForeignKey:GoodTypeId;AssociationForeignKey:ID" json:"type"`
+	Patients                Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
+	Count                   int64               `gorm:"column:count" json:"count"`
+	Type                    int64               `gorm:"column:type" json:"type"`
+	WarehouseOutInfo        []*WarehouseOutInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"warehouseOutInfo"`
 }
 
 func (AutomaticReduceDetail) TableName() string {

service/gobal_config_service.go

 	if stocktype == 2 {
 		db = db.Where("x.is_sys = 1")
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id,x.ctime,t.drug_name,t.drug_type,t.min_number,t.min_unit,t.max_unit").Joins("left join xt_base_drug as t on t.id = x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id,x.ctime,x.batch_number,x.count_unit,t.drug_name,t.drug_type,t.min_number,t.min_unit,t.max_unit").Joins("left join xt_base_drug as t on t.id = x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
 		db = db.Where("x.warehouse_out_id = ?", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 
+func GetAllSingleDrugDetail(id int64, orgid int64) (outInfo []*models.VmDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if id > 0 {
+		db = db.Where("x.warehouse_out_id = ?", id)
+	}
+
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&outInfo).Error
+	return outInfo, err
+}
+
 func FindDrugStockUserDetailByIdThree(id int64, record_time int64, org_id int64) (user []*DrugAutomaticReduceDetail, err error, total int64) {
 
 	db := readDb.Model(&user)
 	db = db.Preload("Drug", "org_id = ? AND status = 1", org_id)
 	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Preload("DrugWarehouseOutInfo", "drug_id = ? and sys_record_time = ? and status = 1 and org_id = ?", id, record_time, org_id)
 	db = db.Where("status = 1 AND org_id = ? AND drug_id = ? AND record_time =?", org_id, id, record_time)
 	db = db.Count(&total)
 	err = db.Find(&user).Error
 	return user, err, total
 }
+
+func FindeDrugWarehouserInfo(ware_out_id int64, drug_id int64, orgid int64) (outInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and drug_id = ? and org_id = ? and status = 1", ware_out_id, drug_id, orgid).Find(&outInfo).Error
+
+	return outInfo, err
+}

service/stock_service.go

 		"wubi":                           goodInfo.Wubi,
 		"good_kind":                      goodInfo.GoodKind,
 		"medical_insurance_level":        goodInfo.MedicalInsuranceLevel,
-		"retail_price":                   goodInfo.RetailPrice,
+		"retail_price":                   goodInfo.PackingPrice,
 		"medical_insurance_number":       goodInfo.MedicalInsuranceNumber,
 		"is_special_diseases":            goodInfo.IsSpecialDiseases,
 		"is_record":                      goodInfo.IsRecord,
 	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
 	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
 	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
 	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
 }
 
 type DrugAutomaticReduceDetail struct {
-	ID                      int64            `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64            `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	WarehouseOutOrderNumber string           `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	PatientId               int64            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	Ctime                   int64            `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                   int64            `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                  int64            `gorm:"column:status" json:"status" form:"status"`
-	RecordTime              int64            `gorm:"column:record_time" json:"record_time" form:"record_time"`
-	OrgId                   int64            `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	DrugId                  int64            `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Count                   int64            `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string           `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	Drug                    *Drug            `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
-	Patients                *models.Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
+	ID                      int64                          `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64                          `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber string                         `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	PatientId               int64                          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Ctime                   int64                          `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64                          `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64                          `gorm:"column:status" json:"status" form:"status"`
+	RecordTime              int64                          `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	OrgId                   int64                          `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugId                  int64                          `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count                   int64                          `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string                         `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Drug                    *Drug                          `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	Patients                *models.Patients               `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
+	DrugWarehouseOutInfo    []*models.DrugWarehouseOutInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"drugwarehouseoutinfo"`
 }
 
 func (DrugAutomaticReduceDetail) TableName() string {
 	if is_sys == 3 {
 		db = db.Where("x.is_sys = 0")
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.is_sys").Offset(offset).Count(&total).Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.is_sys,x.number,x.dealer,x.manufacturer").Offset(offset).Count(&total).Scan(&info).Error
 	return info, total, err
 }
 
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
 	db = db.Preload("GoodInfo", "org_id = ? AND status = 1", org_id)
 	db = db.Preload("GoodsType", "status = 1")
 	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Preload("WarehouseOutInfo", "org_id = ? and status = 1 and good_id = ? and sys_record_time = ?", org_id, good_id, record_time)
 	db = db.Where("status = 1 AND org_id = ? AND good_id = ? AND record_time = ? ", org_id, good_id, record_time)
 	db = db.Count(&total)
 	err = db.Find(&user).Error
+
 	return
 }
 
 	if endtime > 0 {
 		db = db.Where("x.ctime<=?", endtime)
 	}
-	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
+	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
 
 	return info, err
 }
 	err = db.Select("x.good_id,sum(x.count) as count").Group("x.good_id").Scan(&info).Error
 	return info, err
 }
+
+func GetWarehoureOutOrderInfo(goodid int64, orgid int64) (*models.WarehouseOutInfo, error) {
+
+	info := models.WarehouseOutInfo{}
+	var err error
+	err = XTReadDB().Model(&info).Where("good_id = ? and org_id = ? and status = 1", goodid, orgid).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func GetWarehoureOrderInfoCount(goodid int64, orgid int64) (info models.WarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status =1")
+	if goodid > 0 {
+		db = db.Where("x.good_id = ?", goodid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.good_id,sum(x.count) as count").Scan(&info).Error
+	return info, err
+}
+
+func GetStockBatchNumber(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("good_id = ? and org_id = ? and status = 1 and number <> ''", id, orgid).Group("number").Find(&info).Error
+	return info, err
+}
+
+func GetWarehouseOutInfoById(id int64, goodid int64) (info []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("warehouse_out_id = ? and good_id = ? and status = 1", id, goodid).Find(&info).Error
+	return info, err
+}
+
+func GetDrugBatchNumber(drug_id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Model(&info).Where("drug_id = ? and org_id = ? and status = 1 and batch_number <>''", drug_id, orgid).Find(&info).Error
+	return info, err
+}

service/warhouse_service.go

 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 	fmt.Println("stock_number999999999999", stock_number)
 	fmt.Println("deliver_number88888888888", deliver_number)
+
+	//查找药品信息
+	baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
 			IsSys:                   1,
 			SysRecordTime:           advice.RecordDate,
 			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   baseInfo.RetailPrice,
+			CountUnit:               advice.PrescribingNumberUnit,
+			RetailPrice:             baseInfo.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   count,
 		}
 
-		warehouseOutInfo.Count = deliver_number
-		warehouseOutInfo.CountUnit = drup.MinUnit
-
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-
+		fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhh2323232323232322323")
 		if errOne != nil {
 			return errOne
 		} else {
 				RecordTime:              advice.RecordDate,
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
-				Count:                   deliver_number,
-				CountUnit:               drup.MinUnit,
+				Count:                   count,
+				CountUnit:               advice.PrescribingNumberUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
 		}
 
 		if warehouse.StockMaxNumber < maxNumber {
-
+			fmt.Println("尽量323223232")
 			return errors.New("库存数量不足")
 		}
 
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
 			IsSys:                   1,
 			SysRecordTime:           advice.RecordDate,
 			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   baseInfo.RetailPrice,
+			CountUnit:               advice.PrescribingNumberUnit,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
+			Count:                   count,
 		}
 
-		warehouseOutInfo.Count = stock_number
-
-		warehouseOutInfo.CountUnit = drup.MinUnit
-
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 				RecordTime:              advice.RecordDate,
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
-				Count:                   stock_number,
-				CountUnit:               drup.MinUnit,
+				Count:                   count,
+				CountUnit:               advice.PrescribingNumberUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
 		prescribingNumber_two_temp := deliver_number - stock_number
 		overPlusNumber := float64(prescribingNumber_two_temp)
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
-		advice.PrescribingNumberUnit = drup.MinUnit
+		advice.PrescribingNumberUnit = advice.PrescribingNumberUnit
 
 		DrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
 	}
 	//开启事物
 
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
-
+	//查找药品信息
+	baseInfo, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
 	if err != nil {
 
 		return err
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
 			IsSys:                   1,
 			SysRecordTime:           advice.RecordDate,
 			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   baseInfo.RetailPrice,
+			CountUnit:               baseInfo.MaxUnit,
+			RetailPrice:             baseInfo.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
 		}
 
-		warehouseOutInfo.Count = deliver_number
+		warehouseOutInfo.Count = count
 		warehouseOutInfo.CountUnit = advice.PrescribingNumberUnit
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 				RecordTime:              advice.RecordDate,
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
-				Count:                   deliver_number,
+				Count:                   count,
 				CountUnit:               advice.PrescribingNumberUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
 			IsSys:                   1,
 			SysRecordTime:           advice.RecordDate,
 			DrugId:                  advice.DrugId,
+			Number:                  warehouse.Number,
+			BatchNumber:             warehouse.BatchNumber,
+			Price:                   baseInfo.RetailPrice,
+			RetailPrice:             baseInfo.RetailPrice,
+			ProductDate:             warehouse.ProductDate,
+			ExpiryDate:              warehouse.ExpiryDate,
+			PatientId:               advice.PatientId,
 		}
 
-		warehouseOutInfo.Count = stock_number
+		warehouseOutInfo.Count = count
 
-		warehouseOutInfo.CountUnit = drup.MinUnit
+		warehouseOutInfo.CountUnit = advice.PrescribingNumberUnit
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
 				RecordTime:              advice.RecordDate,
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
-				Count:                   stock_number,
-				CountUnit:               drup.MinUnit,
+				Count:                   count,
+				CountUnit:               advice.PrescribingNumberUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
 		prescribingNumber_two_temp := deliver_number - stock_number
 		overPlusNumber := float64(prescribingNumber_two_temp)
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
-		advice.PrescribingNumberUnit = drup.MinUnit
+		advice.PrescribingNumberUnit = advice.PrescribingNumberUnit
 
 		HisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
 	}
 
 	fmt.Println("单位1", advice.CountUnit)
 	fmt.Println("单位2", drup.MaxUnit)
+
 	if advice.CountUnit == drup.MaxUnit {
 		deliver_number = prescribingNumber * drup.MinNumber
 	} else {
 			Price:                   advice.Price,
 		}
 
-		warehouseOutInfo.Count = deliver_number
+		warehouseOutInfo.Count = prescribingNumber
 		warehouseOutInfo.CountUnit = advice.CountUnit
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 			RetailPrice:             advice.RetailPrice,
 			Price:                   advice.Price,
 		}
-
-		warehouseOutInfo.Count = stock_number
+		warehouseOutInfo.Count = prescribingNumber
 
 		warehouseOutInfo.CountUnit = advice.CountUnit
 
 	// 如果没有对应的库存，则报错
 
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId)
-	fmt.Println("库存数量9999343434343434343434343434343434", warehouse.StockCount)
+
 	if err != nil {
 		return
 	}
 	// 将该批次的剩余库存数量转换为拆零数量
 	stock_number = warehouse.StockCount
 
+	//获取耗材信息
+	info, _ := GetGoodInformationByGoodId(goods.GoodId)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
 			IsSys:                   1,
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
 			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   info.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
 		}
 		warehouseOutInfo.Count = count
 		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
 
 		return nil
 	} else {
-		fmt.Println("中国共产党万岁22322332323232322323232323232323")
+
 		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
-		//warehouseOutInfo := &models.WarehouseOutInfo{
-		//  WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-		//  WarehouseOutId:          warehouseOut.ID,
-		//  WarehouseInfotId:        warehouse.ID,
-		//  Status:                  1,
-		//  Ctime:                   time.Now().Unix(),
-		//  Remark:                  goods.Remark,
-		//  OrgId:                   orgID,
-		//  Type:                    1,
-		//  Manufacturer:            goods.Manufacturer,
-		//  Dealer:                  goods.Dealer,
-		//  IsSys:                   0,
-		//  SysRecordTime:           record_time,
-		//  GoodTypeId:              goods.GoodTypeId,
-		//  GoodId:                  goods.GoodId,
-		//  ExpiryDate:              goods.ExpiryDate,
-		//  ProductDate:             goods.ProductDate,
-		//  Number:                  goods.Number,
-		//  Price:                   goods.Price,
-		//  LicenseNumber:           goods.LicenseNumber,
-		//}
-		//warehouseOutInfo.Count = stock_number
-		//stockInInfo, _ :=FindLastStockInInfoRecord(goods.GoodId, orgID)
-		//fmt.Println("stockINFO2232232323223322332323223323223",stockInInfo)
-		//warehouseOutInfo.Price = stockInInfo.Price
-		//
-		//errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
-		//fmt.Println("errOne2232323232323232333232323",errOne)
-		//if errOne != nil {
-		//  return errOne
-		//}
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   info.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+		}
+		warehouseOutInfo.Count = stock_number
+		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
 		// 出库完成后，要将该批次库存清零
 		warehouse.StockCount = 0
 		warehouse.Mtime = time.Now().Unix()