耗材参数

controllers/drug_stock_api_contorller.go

@@ -183,15 +183,29 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				}
 
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
-					utils.ErrorLog("number")
+				if items["lot_number"] == nil || reflect.TypeOf(items["lot_number"]).String() != "string" {
+					utils.ErrorLog("lot_number")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				number, _ := items["number"].(string)
+				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["packing_unit"] == nil || reflect.TypeOf(items["packing_unit"]).String() != "string" {
+					utils.ErrorLog("packing_unit")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				packing_unit, _ := items["packing_unit"].(string)
 
 				var remark string
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 					remark = ""
 				} else {
 					remark = items["remark"].(string)
@@ -201,7 +215,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					WarehousingOrder: warehousing.WarehousingOrder,
 					WarehousingId:    warehousing.ID,
 					DrugId:           drug_id,
-					Number:           number,
+					Number:           lot_number,
 					ProductDate:      productDates,
 					ExpiryDate:       expiryDates,
 					WarehousingCount: warehousing_count,
@@ -215,7 +229,10 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					Manufacturer:     manufacturer_id,
 					Dealer:           dealer_id,
 					//RetailPrice:      retail_price,
+					StockMaxNumber:   warehousing_count,
 					RetailTotalPrice: retail_price_total,
+					BatchNumber:      batch_number,
+					MaxUnit:          packing_unit,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -429,6 +446,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 
 	warehousing, err := service.FindDrugWarehousingById(id, admin.CurrentOrgId)
 
+	manufacturerList, _ := service.GetAllDrugLibList(admin.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -441,8 +459,9 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 	warehousingInfo, err := service.FindDrugWarehousingInfoById(id, admin.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"info":        warehousingInfo,
-			"warehousing": warehousing,
+			"info":             warehousingInfo,
+			"warehousing":      warehousing,
+			"manufacturerList": manufacturerList,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -450,11 +469,12 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 }
 
 func (c *StockDrugApiController) EditDrugWarehouse() {
+
 	warehousing_time := c.GetString("warehousing_time")
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
+	//manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
+	//dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -482,8 +502,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
 		Type:             warehouse.Type,
-		Dealer:           dealer_id,
-		Manufacturer:     manufacturer_id,
+		//Dealer:           dealer_id,
+		//Manufacturer:     manufacturer_id,
 	}
 
 	service.EditDrugWarehousingOne(warehousing, id)
@@ -501,6 +521,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
 		thisStockIn, _ := dataBody["stockIn"].([]interface{})
+
 		if len(thisStockIn) > 0 {
 			for _, item := range thisStockIn {
 				items := item.(map[string]interface{})
@@ -528,13 +549,22 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 				total := float64(warehousing_count) * price
 
-				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
-					utils.ErrorLog("retail_price")
+				//if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+				//	utils.ErrorLog("retail_price")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				//retail_price_total := float64(warehousing_count) * last_price
+
+				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+					utils.ErrorLog("last_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
-				retail_price_total := float64(warehousing_count) * retail_price
+				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+
+				retail_price_total := float64(warehousing_count) * last_price
 
 				var productDates int64
 				var expiryDates int64
@@ -551,8 +581,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						expiryDates = expiry_date.Unix()
 
 					}
-
 				}
+
 				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
 					productDates = 0
 				} else {
@@ -574,8 +604,15 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				number, _ := items["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)
+
 				var remark string
-				if items["number"] == nil || reflect.TypeOf(items["number"]).String() != "string" {
+				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 					remark = ""
 				} else {
 					remark = items["remark"].(string)
@@ -588,13 +625,13 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				id := int64(items["id"].(float64))
 
-				if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "float64" {
-					utils.ErrorLog("dealer")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				dealer := int64(items["dealer"].(float64))
-
+				//if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "float64" {
+				//	utils.ErrorLog("dealer")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//dealer := int64(items["dealer"].(float64))
+				//
 				if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "float64" {
 					utils.ErrorLog("manufacturer")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -618,9 +655,10 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
 						Manufacturer:     manufacturer,
-						Dealer:           dealer,
-						RetailPrice:      retail_price,
+						//Dealer:           dealer,
+						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
+						BatchNumber:      batch_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -642,8 +680,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
 						Manufacturer:     manufacturer,
-						Dealer:           dealer,
-						RetailPrice:      retail_price,
+						//Dealer:           dealer,
+						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)

controllers/patient_api_controller.go

@@ -1653,205 +1653,206 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			//查询已经执行的医嘱
 			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
-				fmt.Println("非自备要22222")
-				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)
-								}
 
-							}
-						}
-					}
-				}
+				//调用药品出库接口
+				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("33333", item.ExecutionState)
-			fmt.Println("医嘱名称", item.AdviceName)
-			fmt.Println("item", item.Way)
+
 			if item.Way == 2 {
 				if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
 

models/drug_stock.go

@@ -42,6 +42,11 @@ type DrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	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"`
+	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
 }
 
 func (DrugWarehouseInfo) TableName() string {
@@ -78,7 +83,7 @@ type DrugWarehouseOutInfo 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"`
+	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"`
@@ -211,7 +216,7 @@ type DrugAutomaticReduceDetail struct {
 	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"`
+	CountUnit               string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 }
 
 func (DrugAutomaticReduceDetail) TableName() string {

models/his_models.go

@@ -233,6 +233,7 @@ type HisDoctorAdviceInfo struct {
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
 	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Way                   int64                  `gorm:"column:way" json:"way" form:"way"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

models/self_drug_models.go

@@ -387,6 +387,8 @@ type XtDrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	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"`
+	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
+	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {

service/stock_service.go

@@ -458,12 +458,17 @@ func FindLastWarehousingInfo(order string) (info models.WarehousingInfo, err err
 
 }
 
+//药品先进先出,找出最先入库的批次
+
+func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouseInfo, err error) {
+	err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
+	return info, err
+}
+
 // 出库时先进先出，找出最先入库的批次
 func FindLastWarehousingInfoByID(drug_id int64) (info models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("drup_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) ", drug_id).Order("ctime").First(&info).Error
-
 	return info, err
-
 }
 
 func FindLastDrugWarehousingInfo(order string) (info models.DrugWarehouseInfo, err error) {
@@ -540,6 +545,7 @@ type VMDrugWarehouseInfo struct {
 	Type             int64   `gorm:"column:type" json:"type" form:"type"`
 	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"`
 	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
@@ -566,6 +572,9 @@ type Drug struct {
 	PackingUnit     string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	PackingPrice    float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	DrugDay         string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
+	MaxUnit         string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit         string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	LastPrice       float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 }
 
 func (Drug) TableName() string {
@@ -1422,7 +1431,6 @@ func UpDateDrugWarehousingInfo(info *models.DrugWarehouseInfo) (err error) {
 	return err
 }
 
-
 func EditWarehousing(warehouse models.Warehousing) {
 	err = readDb.Model(&models.Warehousing{}).Where("warehousing_order = ? AND status = 1", warehouse.WarehousingOrder).Update(map[string]interface{}{"mtime": time.Now().Unix(), "warehousing_time": warehouse.WarehousingTime, "modifier": warehouse.Modifier, "dealer": warehouse.Dealer, "manufacturer": warehouse.Manufacturer}).Error
 
@@ -1601,6 +1609,11 @@ func UpDateWarehouseOutStatus(id int64) (err error) {
 	return
 }
 
+func UpDateDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo) (err error) {
+	err = writeDb.Save(&info).Error
+	return err
+}
+
 func UpDateWarehouseInfoByStock(info *models.WarehousingInfo) (err error) {
 	err = writeDb.Save(&info).Error
 	return err

service/warhouse_service.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/models"
 	"XT_New/utils"
 	"errors"
+	"fmt"
 	_ "fmt"
 	"github.com/jinzhu/gorm"
 	"math"
@@ -91,7 +92,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
-	warehouse, err := FindLastWarehousingInfoByID(advice.DrugId)
+	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId)
+	fmt.Println("查询222222222222222222222222222222222222222222222222", err)
 	if err != nil {
 		return err
 	}
@@ -167,7 +169,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		if warehouse.StockMaxNumber < 0 {
 			return errors.New("库存数量不足")
 		}
-		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
 			return errThree
 		}
@@ -220,7 +222,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		warehouse.StockMaxNumber = 0
 		warehouse.StockMinNumber = 0
 		warehouse.Mtime = time.Now().Unix()
-		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 		if errThree != nil {
 			return errThree
 		}