耗材参数

controllers/drug_stock_api_contorller.go

@@ -183,18 +183,8 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				}
 
-				if items["lot_number"] == nil || reflect.TypeOf(items["lot_number"]).String() != "string" {
-					utils.ErrorLog("lot_number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				lot_number, _ := items["lot_number"].(string)
 
-				if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
-					utils.ErrorLog("batch_number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				batch_number, _ := items["batch_number"].(string)
 
 				if items["max_unit"] == nil || reflect.TypeOf(items["max_unit"]).String() != "string" {
@@ -613,11 +603,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				number, _ := items["lot_number"].(string)
 
-				if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
-					utils.ErrorLog("batch_number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				batch_number, _ := items["batch_number"].(string)
 
 				max_unit, _ := items["max_unit"].(string)

controllers/gobal_config_api_controller.go

@@ -1815,7 +1815,7 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	page, _ := c.GetInt64("page", -1)
 	limit, _ := c.GetInt64("limit", -1)
 	keyword := c.GetString("keyword")
-	drug_category, _ := c.GetInt64("drug_category")
+	drug_type, _ := c.GetInt64("drug_type")
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	timeLayout := "2006-01-02"
@@ -1844,7 +1844,7 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	//查询入库数量
-	list, total, err := service.GetDrugStockList(page, limit, keyword, drug_category, startTime, endTime, adminUserInfo.CurrentOrgId)
+	list, total, err := service.GetDrugStockList(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
@@ -1958,7 +1958,7 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
-	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, limit, page)
+	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, page, limit)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -1999,8 +1999,10 @@ func (c *GobalConfigApiController) GetDrugCountList() {
 	}
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetDrugCountList(startTime, endTime, orgId)
+	countList, err := service.GetMinCountList(startTime, endTime, orgId)
 	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
 	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
+	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -2009,6 +2011,8 @@ func (c *GobalConfigApiController) GetDrugCountList() {
 		"countList":    list,
 		"outCountList": outCountList,
 		"auCountList":  auCountList,
+		"minCount":     countList,
+		"info":         info,
 	})
 }
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -541,19 +541,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		adminUserInfo := c.GetMobileAdminUserInfo()
 
-		//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-		//
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//	if getPermissionErr != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//		return
-		//	} else if headNursePermission == nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//		return
-		//	}
-		//}
-
 		var advice models.DoctorAdvice
 
 		if groupno > 0 {
@@ -561,7 +548,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			for _, item := range advices {
 				if item.ExecutionState == 2 {
 					advice = item
-
 				}
 			}
 		} else {
@@ -569,7 +555,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			for _, item := range advices {
 				if item.ExecutionState == 2 {
 					advice = item
-
 				}
 			}
 		}
@@ -628,327 +613,34 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 				isHasWay := false //用来判断是否包含来自药品库的医嘱
-				record_time := int64(0)
 				for _, item := range advices {
 					if item.Way == 1 {
 						isHasWay = true
-						record_time = item.RecordDate
 					}
 				}
 
 				if isHasWay {
-					_, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
-					if err == gorm.ErrRecordNotFound {
-						//没有记录，则创建出库单
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
-						total = total + 1
-						warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 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.Org.Id,
-							Creater:                 creater,
-							Ctime:                   time.Now().Unix(),
-							Status:                  1,
-							WarehouseOutTime:        record_time,
-							Dealer:                  0,
-							Manufacturer:            0,
-							Type:                    1,
-							IsSys:                   1,
-						}
-						err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-						if err != nil {
-							utils.TraceLog("创建出库单失败 err = %v", err)
-						} else {
-							for _, item := range advices {
-								if item.Way == 1 {
-
-									service.DrugsDelivery(item.UserOrgId, &item)
-
-									//if item.PrescribingNumber > 0 {
-									//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
-									//		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-									//		WarehouseOutId:          warehouseOut.ID,
-									//		Status:                  1,
-									//		Ctime:                   time.Now().Unix(),
-									//		Remark:                  "",
-									//		OrgId:                   adminUserInfo.Org.Id,
-									//		Type:                    1,
-									//		Manufacturer:            0,
-									//		Dealer:                  0,
-									//		IsSys:                   1,
-									//		SysRecordTime:           record_time,
-									//		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.Org.Id)
-									//	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:              record_time,
-									//			OrgId:                   adminUserInfo.Org.Id,
-									//			DrugId:                  item.DrugId,
-									//			Count:                   count,
-									//		}
-									//		service.AddSigleDrugAutoReduceRecordInfo(details)
-									//	}
-									//}
-								}
-
-							}
-						}
-
-					} else if err == nil {
-						for _, item := range advices {
-							if item.Way == 1 {
-								service.DrugsDelivery(item.UserOrgId, &item)
-								//outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, 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.Org.Id,
-								//		Type:                    1,
-								//		Manufacturer:            0,
-								//		Dealer:                  0,
-								//		IsSys:                   1,
-								//		SysRecordTime:           record_time,
-								//	}
-								//
-								//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-								//	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:              record_time,
-								//			OrgId:                   adminUserInfo.Org.Id,
-								//			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.Org.Id, outInfo.ID, count)
-								//	}
-								//
-								//	//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, 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:              record_time,
-								//		OrgId:                   adminUserInfo.Org.Id,
-								//		DrugId:                  item.DrugId,
-								//		Count:                   count,
-								//	}
-								//	service.AddSigleDrugAutoReduceRecordInfo(details)
-								//
-								//}
-							}
+					for _, item := range advices {
+						if item.Way == 1 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 						}
-
 					}
-
 				}
 			} else {
 				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 				isHasWay := false //用来判断是否包含来自药品库的医嘱
-				record_time := int64(0)
+
 				for _, item := range advices {
 					if item.Way == 1 {
 						isHasWay = true
-						record_time = item.RecordDate
 					}
 				}
-
 				if isHasWay {
-					_, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
-					if err == gorm.ErrRecordNotFound {
-						//没有记录，则创建出库单
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
-						total = total + 1
-						warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 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.Org.Id,
-							Creater:                 creater,
-							Ctime:                   time.Now().Unix(),
-							Status:                  1,
-							WarehouseOutTime:        record_time,
-							Dealer:                  0,
-							Manufacturer:            0,
-							Type:                    1,
-							IsSys:                   1,
-						}
-						err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-						if err != nil {
-							utils.TraceLog("创建出库单失败 err = %v", err)
-						} else {
-							for _, item := range advices {
-								if item.Way == 1 {
-									service.DrugsDelivery(item.UserOrgId, &item)
-									//if item.PrescribingNumber > 0 {
-									//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
-									//		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-									//		WarehouseOutId:          warehouseOut.ID,
-									//		Status:                  1,
-									//		Ctime:                   time.Now().Unix(),
-									//		Remark:                  "",
-									//		OrgId:                   adminUserInfo.Org.Id,
-									//		Type:                    1,
-									//		Manufacturer:            0,
-									//		Dealer:                  0,
-									//		IsSys:                   1,
-									//		SysRecordTime:           record_time,
-									//		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.Org.Id)
-									//	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:              record_time,
-									//			OrgId:                   adminUserInfo.Org.Id,
-									//			DrugId:                  item.DrugId,
-									//			Count:                   count,
-									//		}
-									//		service.AddSigleDrugAutoReduceRecordInfo(details)
-									//	}
-									//}
-								}
-
-							}
+					for _, item := range advices {
+						if item.Way == 1 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 						}
-
-					} else if err == nil {
-						for _, item := range advices {
-							if item.Way == 1 {
-								service.DrugsDelivery(item.UserOrgId, &item)
-								//outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, 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.Org.Id,
-								//		Type:                    1,
-								//		Manufacturer:            0,
-								//		Dealer:                  0,
-								//		IsSys:                   1,
-								//		SysRecordTime:           record_time,
-								//	}
-								//
-								//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-								//	warehouseOutInfo.Price = stockInInfo.Price
-								//	warehouseOutInfo.DrugId = item.DrugId
-								//	//warehouseOutInfo.Count = item.
-								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								//	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:              record_time,
-								//			OrgId:                   adminUserInfo.Org.Id,
-								//			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.Org.Id, outInfo.ID, count)
-								//	}
-								//
-								//	//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, 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:              record_time,
-								//		OrgId:                   adminUserInfo.Org.Id,
-								//		DrugId:                  item.DrugId,
-								//		Count:                   count,
-								//	}
-								//	service.AddSigleDrugAutoReduceRecordInfo(details)
-								//
-								//
-								//}
-							}
-						}
-
 					}
-
 				}
 			}
 		}
@@ -1070,6 +762,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			return
 		}
 		adminInfo := c.GetMobileAdminUserInfo()
+		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		advice_id, _ := c.GetInt64("advice_id")
 		advices, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
 		if advices.ExecutionState == 1 {
@@ -1096,143 +789,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			fmt.Println("drugstockconfig000000000000000000000000", drugStockConfig.IsOpen)
 			if drugStockConfig.IsOpen == 1 {
 				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
-				record_time := advice.RecordDate
-
-				out, err := service.FindDrugStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-				if err == gorm.ErrRecordNotFound {
-					//没有记录，则创建出库单
-					timeStr := time.Now().Format("2006-01-02")
-					timeArr := strings.Split(timeStr, "-")
-					total, _ := service.FindAllDrugWarehouseOut(adminInfo.Org.Id)
-					total = total + 1
-					warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 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 := adminInfo.AdminUser.Id
-					warehouseOut := models.DrugWarehouseOut{
-						WarehouseOutOrderNumber: warehousing_out_order,
-						OperationTime:           time.Now().Unix(),
-						OrgId:                   adminInfo.Org.Id,
-						Creater:                 creater,
-						Ctime:                   time.Now().Unix(),
-						Status:                  1,
-						WarehouseOutTime:        record_time,
-						Dealer:                  0,
-						Manufacturer:            0,
-						Type:                    1,
-						IsSys:                   1,
-					}
-					err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-					if err != nil {
-						utils.TraceLog("创建出库单失败 err = %v", err)
-					} else {
-						if advice.PrescribingNumber > 0 {
-							warehouseOutInfo := &models.DrugWarehouseOutInfo{
-								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-								WarehouseOutId:          warehouseOut.ID,
-								Status:                  1,
-								Ctime:                   time.Now().Unix(),
-								Remark:                  "",
-								OrgId:                   adminInfo.Org.Id,
-								Type:                    1,
-								Manufacturer:            0,
-								Dealer:                  0,
-								IsSys:                   1,
-								SysRecordTime:           record_time,
-								DrugId:                  advice.DrugId,
-							}
-							prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-							warehouseOutInfo.Count = count
-							stockInInfo, _ := service.FindLastDrugStockInInfoRecord(advice.DrugId, adminInfo.Org.Id)
-							warehouseOutInfo.Price = stockInInfo.Price
-							err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-
-							if err == nil {
-								service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
-								//details := &models.DrugAutomaticReduceDetail{
-								//	WarehouseOutId:          warehouseOutInfo.ID,
-								//	WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-								//	PatientId:               advice.PatientId,
-								//	Ctime:                   time.Now().Unix(),
-								//	Mtime:                   time.Now().Unix(),
-								//	Status:                  1,
-								//	RecordTime:              record_time,
-								//	OrgId:                   adminInfo.Org.Id,
-								//	DrugId:                  advice.DrugId,
-								//	Count:                   count,
-								//}
-								//service.AddSigleDrugAutoReduceRecordInfo(details)
-							}
-						}
-					}
-
-				} else if err == nil {
-					_, err := service.FindDrugStockOutInfoByTypeId(adminInfo.Org.Id, advice.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:                   adminInfo.Org.Id,
-							Type:                    1,
-							Manufacturer:            0,
-							Dealer:                  0,
-							IsSys:                   1,
-							SysRecordTime:           record_time,
-						}
-
-						stockInInfo, _ := service.FindLastDrugStockInInfoRecord(advice.DrugId, adminInfo.Org.Id)
-						warehouseOutInfo.Price = stockInInfo.Price
-						warehouseOutInfo.DrugId = advice.DrugId
-						prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						warehouseOutInfo.Count = count
-						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-						if err == nil {
-							service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
-							//details := &models.DrugAutomaticReduceDetail{
-							//	WarehouseOutId:          warehouseOutInfo.ID,
-							//	WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-							//	PatientId:               advice.PatientId,
-							//	Ctime:                   time.Now().Unix(),
-							//	Mtime:                   time.Now().Unix(),
-							//	Status:                  1,
-							//	RecordTime:              record_time,
-							//	OrgId:                   adminInfo.Org.Id,
-							//	DrugId:                  advice.DrugId,
-							//	Count:                   count,
-							//}
-							//service.AddSigleDrugAutoReduceRecordInfo(details)
-						}
-
-					} else if err == nil { //记录存在，则将增加数量
-						service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
-						//if outInfo.ID > 0 {
-						//	prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						//	service.UpdateDrugStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, count)
-						//}
-						//prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						//count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						//details := &models.DrugAutomaticReduceDetail{
-						//	WarehouseOutId:          outInfo.ID,
-						//	WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-						//	PatientId:               advice.PatientId,
-						//	Ctime:                   time.Now().Unix(),
-						//	Mtime:                   time.Now().Unix(),
-						//	Status:                  1,
-						//	RecordTime:              record_time,
-						//	OrgId:                   adminInfo.Org.Id,
-						//	DrugId:                  advice.DrugId,
-						//	Count:                   count,
-						//}
-						//service.AddSigleDrugAutoReduceRecordInfo(details)
-					}
-				}
+				service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 			}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "ok",

controllers/patient_api_controller.go

@@ -1856,7 +1856,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			for _, item := range advices {
 				fmt.Println("imte00000000000000", item.PrescribingNumber)
 				//调用药品出库接口
-				service.DrugsDelivery(item.UserOrgId, item)
+				service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
 				//if item.Way == 1 {
 				//	out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
@@ -2180,7 +2180,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
 
-				service.HisDrugsDelivery(item.UserOrgId, item)
+				service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
 				//out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
 				//if err == gorm.ErrRecordNotFound {

controllers/stock_in_api_controller.go

@@ -89,6 +89,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/getorderdetialbyorderid", &StockManagerApiController{}, "Get:GetOrderDetialByOrderId")
 	beego.Router("/api/good/getorderdetaibyid", &StockManagerApiController{}, "Get:GetOrderDetailById")
 	beego.Router("/api/good/getsingleoutorderdetail", &StockManagerApiController{}, "Get:GetSingleOutOrderDetail")
+	beego.Router("/api/stock/getexportstocklist", &StockManagerApiController{}, "Get:GetExprotStockList")
+
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -3788,6 +3790,7 @@ func (this *StockManagerApiController) GetStockDrugCount() {
 	count, _ := service.GetStockDrugCount(startTime, endTime, orgId)
 	outList, _ := service.GetAutoDiallysisBefor(startTime, endTime, orgId)
 	autoCount, _ := service.GetOutStockTotalCountFour(startTime, endTime, orgId)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"count":     count,
 		"outList":   outList,
@@ -3838,3 +3841,39 @@ func (this *StockManagerApiController) GetSingleOutOrderDetail() {
 		"goodType":         goodType,
 	})
 }
+
+func (this *StockManagerApiController) GetExprotStockList() {
+
+	id, _ := this.GetInt64("id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, _ := service.GetExprotStockList(orgId, id, startTime, endTime)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/self_drug_models.go

@@ -606,6 +606,7 @@ type VmDrugWarehouseOutInfo struct {
 	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"`

models/stock_models.go

@@ -71,28 +71,32 @@ func (Warehousing) TableName() string {
 }
 
 type StWarehousingInfo struct {
-	ID               int64   `gorm:"column:id" json:"id"`
-	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
-	GoodId           int64   `gorm:"column:good_id" json:"good_id"`
-	GoodTypeId       int64   `gorm:"column:good_type_id" json:"good_type_id"`
-	Number           string  `gorm:"column:number" json:"number"`
-	ProductDate      int64   `gorm:"column:product_date" json:"product_date"`
-	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date"`
-	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
-	WarehousingUnit  string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
-	Price            float64 `gorm:"column:price" json:"price"`
-	TotalPrice       float64 `gorm:"column:total_price" json:"total_price"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer"`
-	Remark           string  `gorm:"column:remark" json:"remark"`
-	Ctime            int64   `gorm:"column:ctime" json:"ctime"`
-	Mtime            int64   `gorm:"column:mtime" json:"mtime"`
-	Status           int64   `gorm:"column:status" json:"status"`
-	OrgId            int64   `gorm:"column:org_id" json:"org_id"`
-	IsReturn         int64   `gorm:"column:is_return" json:"is_return"`
-	StockCount       int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order"`
-	Type             int64   `gorm:"column:type" json:"type"`
+	ID                int64   `gorm:"column:id" json:"id"`
+	WarehousingId     int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId            int64   `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId        int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	Number            string  `gorm:"column:number" json:"number"`
+	ProductDate       int64   `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate        int64   `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount  int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price             float64 `gorm:"column:price" json:"price"`
+	TotalPrice        float64 `gorm:"column:total_price" json:"total_price"`
+	Dealer            int64   `gorm:"column:dealer" json:"dealer"`
+	Manufacturer      int64   `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark            string  `gorm:"column:remark" json:"remark"`
+	Ctime             int64   `gorm:"column:ctime" json:"ctime"`
+	Mtime             int64   `gorm:"column:mtime" json:"mtime"`
+	Status            int64   `gorm:"column:status" json:"status"`
+	OrgId             int64   `gorm:"column:org_id" json:"org_id"`
+	IsReturn          int64   `gorm:"column:is_return" json:"is_return"`
+	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order"`
+	Type              int64   `gorm:"column:type" json:"type"`
+	GoodName          string  `json:"good_name"`
+	PackingUnit       string  `json:"packing_unit"`
+	TotalCount        int64   `json:"total_count"`
+	SpecificationName string  `json:"specification_name"`
 }
 
 func (StWarehousingInfo) TableName() string {

service/gobal_config_service.go

@@ -511,18 +511,26 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 	if endtime > 0 {
 		db = db.Where("x.ctime<=?", endtime)
 	}
-	if drugcategory > 0 {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id =?", orgid).Where("t.drug_category = ?", drugcategory).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
-
-	} else {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+	if drugcategory > 0 && len(keyword) == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id =?", orgid).Where("t.drug_type = ?", drugcategory).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
+	}
+	if drugcategory <= 0 && len(keyword) == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
 	}
 
-	if len(keyword) > 0 {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id=?", orgid).Where("t.drug_name like ?", likeKey).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+	if len(keyword) > 0 && drugcategory == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id=?", orgid).Where("t.drug_name like ?", likeKey).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 		return
-	} else {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+	}
+	if len(keyword) <= 0 && drugcategory == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
+	}
+
+	if len(keyword) > 0 && drugcategory > 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Where("t.drug_type = ? or t.drug_name like ?", drugcategory, likeKey).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 		return
 	}
 
@@ -582,7 +590,7 @@ func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64
 
 func GetBatchOrderDetail(drugid int64, orgid int64, page int64, limit int64) (drug []*models.DrugWarehouseInfo, total int64, err error) {
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ?", drugid, orgid).Offset(offset).Count(&total).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ?", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Find(&drug).Error
 	return drug, total, err
 }
 
@@ -603,6 +611,22 @@ func GetDrugCountList(startime int64, endtime int64, orgid int64) (info []*model
 	return info, err
 }
 
+func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("c.time<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("sum(x.stock_min_number) as count,x.drug_id").Group("x.drug_id").Scan(&info).Error
+	return info, err
+}
+
 func GetOutDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
 	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
 

service/stock_service.go

@@ -2951,3 +2951,46 @@ func GetGoodInformationByGoodId(good_id int64) (models.GoodInfo, error) {
 	err := XTReadDB().Where("id = ? and status = 1", good_id).Find(&info).Error
 	return info, err
 }
+
+func GetExprotStockList(orgid int64, orderid int64, startime int64, endtime int64) (info []*models.StWarehousingInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if orderid > 0 {
+		db = db.Where("x.warehousing_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	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,Sum(x.warehousing_count)as total_count,x.price,x.dealer,x.manufacturer,x.remark,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").Group("x.good_id").Scan(&info).Error
+
+	return info, err
+}
+
+func GetDrugWarehouOrderInfo(startime int64, endtime int64, orgid int64) (info []*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 startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Select("x.drug_id,x.count,x.count_unit,t.max_unit,t.min_unit,t.min_number").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -16,7 +16,7 @@ import (
 
 // 药品出库
 
-func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
+func DrugsDelivery(orgID int64, creater int64, advice *models.DoctorAdvice) (err error) {
 	// 1.判断药品是否来自专用字典的药品库
 	// 2.判断当天当前机构有没有创建出库单，没有则创建
 	// 3.创建出库流程
@@ -45,7 +45,7 @@ func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
 				WarehouseOutOrderNumber: warehousing_out_order,
 				OperationTime:           time.Now().Unix(),
 				OrgId:                   orgID,
-				Creater:                 0,
+				Creater:                 creater,
 				Ctime:                   time.Now().Unix(),
 				Status:                  1,
 				WarehouseOutTime:        record_time,
@@ -258,7 +258,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 // 药品出库
 
-func HisDrugsDelivery(orgID int64, advice *models.HisDoctorAdviceInfo) (err error) {
+func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo) (err error) {
 	// 1.判断药品是否来自专用字典的药品库
 	// 2.判断当天当前机构有没有创建出库单，没有则创建
 	// 3.创建出库流程
@@ -284,7 +284,7 @@ func HisDrugsDelivery(orgID int64, advice *models.HisDoctorAdviceInfo) (err erro
 				WarehouseOutOrderNumber: warehousing_out_order,
 				OperationTime:           time.Now().Unix(),
 				OrgId:                   orgID,
-				Creater:                 0,
+				Creater:                 creater,
 				Ctime:                   time.Now().Unix(),
 				Status:                  1,
 				WarehouseOutTime:        record_time,
@@ -350,7 +350,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	// 将该批次的剩余库存数量转换为拆零数量
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-
+	fmt.Println("拆零数量2222222222222222222", stock_number)
+	fmt.Println("出库数量55555555555555555555", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -369,7 +370,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 
 		warehouseOutInfo.Count = deliver_number
-		warehouseOutInfo.CountUnit = drup.MinUnit
+		warehouseOutInfo.CountUnit = advice.PrescribingNumberUnit
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 
@@ -388,7 +389,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
 				Count:                   deliver_number,
-				CountUnit:               drup.MinUnit,
+				CountUnit:               advice.PrescribingNumberUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {