Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

controllers/drug_stock_api_contorller.go

@@ -568,6 +568,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
 				} else {
+
 					warehouseInfo := &models.DrugWarehouseInfo{
 						ID:               id,
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -633,7 +634,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				info, _ := service.GetLastDrugWarehouseInfSix(it.DrugId)
 				flows := models.DrugFlow{
 					WarehousingOrder: info.WarehousingOrder,
-					WarehousingId:    info.ID,
+					WarehousingId:    info.WarehousingId,
 					DrugId:           info.DrugId,
 					Number:           info.Number,
 					ProductDate:      info.ProductDate,
@@ -754,7 +755,19 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 			}
 
 			if item.WarehousingCount == warehouseInfo.WarehousingCount {
-				errs = service.UpDateDrugWarehousingInfo(item)
+				item.OrgId = item.OrgId
+				warehouseinfo := &models.DrugWarehouseInfo{
+					Number:       item.Number,
+					ProductDate:  item.ProductDate,
+					ExpiryDate:   item.ExpiryDate,
+					Price:        item.Price,
+					TotalPrice:   item.TotalPrice,
+					Dealer:       item.Dealer,
+					Manufacturer: item.Manufacturer,
+					Remark:       item.Remark,
+					BatchNumber:  item.BatchNumber,
+				}
+				errs = service.UpDateDrugWarehousingInfoTwo(item.ID, warehouseinfo)
 			}
 		}
 	}
@@ -1572,9 +1585,10 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 	warehouseOut, _ := service.FindDrugWareHouseOutById(id, adminUserInfo.CurrentOrgId)
 
 	tempWarehouseOut := models.DrugWarehouseOut{
-		ID:               warehouseOut.ID,
-		Mtime:            mtime,
-		WarehouseOutTime: warehouseOutDate.Unix(),
+		ID:                      warehouseOut.ID,
+		Mtime:                   mtime,
+		WarehouseOutTime:        warehouseOutDate.Unix(),
+		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 	}
 
 	service.EditDrugWarehouseOut(tempWarehouseOut)
@@ -1856,8 +1870,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				})
 				return
 			} else {
-				errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-				service.CreateDrugFlow(drugFlow)
+				//errs = service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+				//service.CreateDrugFlow(drugFlow)
 				// 出库流程
 				// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
 				drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
@@ -1972,7 +1986,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 				cha_number = min_number - max_number
 				//如果总库存大于差,正常出库
-				if all_number >= cha_number {
+				if all_number > cha_number {
 
 					errs = service.UpDateDrugWarehouseOutInfo(item)
 
@@ -2033,7 +2047,36 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						})
 					}
 				}
+				if all_number == cha_number {
+					warehouseInfo := models.XtDrugWarehouseInfo{
+						Number:       item.Number,
+						ProductDate:  item.ProductDate,
+						ExpiryDate:   item.ExpiryDate,
+						Price:        item.Price,
+						TotalPrice:   item.TotalPrice,
+						Dealer:       item.Dealer,
+						Manufacturer: item.Manufacturer,
+						Remark:       item.Remark,
+						BatchNumber:  item.BatchNumber,
+						MaxUnit:      item.CountUnit,
+					}
+					parseDateErr := service.UpdateDrugWarehouseingInfoSix(item.ID, warehouseInfo)
+					if parseDateErr != nil {
+						utils.ErrorLog(errs.Error())
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+						return
+					}
 
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg":        "2",
+						"drug_name":  "",
+						"dose":       "",
+						"dose_unit":  "",
+						"min_number": "",
+						"min_unit":   "",
+						"max_unit":   "",
+					})
+				}
 				if all_number < cha_number {
 					goodObj, _ := service.GetDrugByGoodId(item.DrugId)
 					c.ServeSuccessJSON(map[string]interface{}{
@@ -2302,29 +2345,29 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		//查询该批次总的退库数量
 		canInfo, _ := service.GetCancelDrugStockOutInfo(item.BatchNumberId, item.DrugId)
 
-		for _, item := range canInfo {
-			if item.MaxUnit == medical.MaxUnit {
-				item.Count = item.Count * medical.MinNumber
+		for _, it := range canInfo {
+			if it.MaxUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
 			}
-			if item.MaxUnit == medical.MinUnit {
-				item.Count = item.Count
+			if it.MaxUnit == medical.MinUnit {
+				it.Count = it.Count
 			}
 		}
 
-		for _, item := range canInfo {
-			can_number += item.Count
+		for _, it := range canInfo {
+			can_number += it.Count
 		}
 
-		for _, item := range outInfo {
-			if item.CountUnit == medical.MaxUnit {
-				item.Count = item.Count * medical.MinNumber
+		for _, it := range outInfo {
+			if it.CountUnit == medical.MaxUnit {
+				it.Count = it.Count * medical.MinNumber
 			}
-			if item.CountUnit == medical.MinUnit {
-				item.Count = item.Count
+			if it.CountUnit == medical.MinUnit {
+				it.Count = it.Count
 			}
 		}
-		for _, item := range outInfo {
-			out_number += item.Count
+		for _, it := range outInfo {
+			out_number += it.Count
 		}
 
 		if out_number == 0 {
@@ -2335,7 +2378,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 			return
 		}
 
-		fmt.Println("hhhh233323232322323", total_number, total_count)
+		fmt.Println("时间任命323332233232", total_number, total_count)
 
 		//判断退库数量是否大于总入库数量
 		if total_number > total_count {
@@ -2363,9 +2406,42 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 		//正常退库
 		if total_number <= out_number {
 			//创建退库详情
-			errs := service.CreateDrugCancelStockInfo(cancelStockInfos)
+			errs := service.CreateCancelStockInfoTwo(item)
 			//创建库存明细
-			errs = service.CreateDrugFlow(drugFlow)
+			flows := models.DrugFlow{
+				WarehousingId:           0,
+				DrugId:                  item.DrugId,
+				Number:                  "",
+				BatchNumber:             item.BatchNumber,
+				Count:                   item.Count,
+				UserOrgId:               adminUserInfo.CurrentOrgId,
+				PatientId:               0,
+				SystemTime:              ctime,
+				ConsumableType:          4,
+				IsSys:                   0,
+				WarehousingOrder:        infoWareInfo.WarehousingOrder,
+				WarehouseOutId:          0,
+				WarehouseOutOrderNumber: "",
+				IsEdit:                  0,
+				CancelStockId:           cancelStock.ID,
+				CancelOrderNumber:       cancelStock.OrderNumber,
+				Manufacturer:            manufacturer_id,
+				Dealer:                  dealer_id,
+				Creator:                 adminUserInfo.AdminUser.Id,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   item.Price,
+				WarehousingDetailId:     0,
+				WarehouseOutDetailId:    0,
+				CancelOutDetailId:       0,
+				ExpireDate:              item.ExpiryDate,
+				ProductDate:             item.ProductDate,
+				MaxUnit:                 item.MaxUnit,
+				MinUnit:                 "",
+			}
+			errs = service.CreateDrugFlowOne(flows)
 
 			var total int64
 
@@ -2404,6 +2480,7 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 				})
 			}
 		}
+
 	}
 }
 func (c *StockDrugApiController) GetDrugCancelStockInfoList() {

controllers/his_api_controller.go

@@ -650,114 +650,132 @@ func (c *HisApiController) CreateHisPrescription() {
 
 	patient, _ := service.GetPatientByIDTwo(adminInfo.CurrentOrgId, patient_id)
 
-	//_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
-	//
-	//_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
-	//
-	//if drugStockConfig.IsOpen == 1 {
-	//	//校验库存总量
-	//	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-	//		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-	//		if len(prescriptions) > 0 {
-	//			for _, item := range prescriptions {
-	//				items := item.(map[string]interface{})
-	//				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
-	//					advices := items["advices"].([]interface{})
-	//					if len(advices) > 0 {
-	//						for _, advice := range advices {
-	//							var drug_id int64
-	//							var prescribing_number float64
-	//							var prescribingNumberUnit string
-	//
-	//							if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
-	//								drug_id = int64(advice.(map[string]interface{})["id"].(float64))
-	//							}
-	//							if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
-	//								//prescribing_number = advice.(map[string]interface{})["prescribing_number"].(string)
-	//								prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
-	//								prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
-	//
-	//							}
-	//
-	//							if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
-	//								prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
-	//							}
-	//
-	//							drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
-	//							if drug.ID == 0 {
-	//								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//								return
-	//							}
-	//
-	//							if prescribingNumberUnit == drug.MinUnit {
-	//								if prescribing_number > drug.Total {
-	//									c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-	//									//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
-	//									return
-	//								}
-	//							} else {
-	//								if prescribingNumberUnit == drug.MaxUnit {
-	//									num := prescribing_number * float64(drug.MinNumber)
-	//									if num > drug.Total {
-	//										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-	//										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
-	//										return
-	//									}
-	//								}
-	//							}
-	//						}
-	//					}
-	//				}
-	//			}
-	//		}
-	//	}
-	//}
-	//
-	//if stockConfig.IsOpen == 1 {
-	//	if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
-	//		prescriptions, _ := dataBody["prescriptions"].([]interface{})
-	//		if len(prescriptions) > 0 {
-	//			for _, item := range prescriptions {
-	//				items := item.(map[string]interface{})
-	//				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
-	//					projects := items["project"].([]interface{})
-	//					if len(projects) > 0 {
-	//						for _, project := range projects {
-	//							var project_id int64
-	//							var project_type int64
-	//							var totals float64
-	//							if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
-	//								project_id = int64(project.(map[string]interface{})["project_id"].(float64))
-	//							}
-	//							if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
-	//								project_type = int64(project.(map[string]interface{})["type"].(float64))
-	//							}
-	//							if project.(map[string]interface{})["total"] != nil || reflect.TypeOf(project.(map[string]interface{})["total"]).String() == "string" {
-	//								total, _ := project.(map[string]interface{})["total"].(string)
-	//
-	//								totals, _ = strconv.ParseFloat(total, 64)
-	//							}
-	//							if project_type == 3 {
-	//								good, _ := service.FindGoodInfoByIdTwo(project_id)
-	//								if good.ID == 0 {
-	//									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//									return
-	//								}
-	//								if totals > good.Total {
-	//									c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
-	//									//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
-	//									return
-	//								}
-	//
-	//							}
-	//
-	//						}
-	//					}
-	//				}
-	//			}
-	//		}
-	//	}
-	//}
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+
+	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
+
+	if drugStockConfig.IsOpen == 1 {
+		//校验库存总量
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
+						advices := items["advices"].([]interface{})
+						if len(advices) > 0 {
+							for _, advice := range advices {
+								var drug_id int64
+								var prescribing_number float64
+								var prescribingNumberUnit string
+
+								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
+									drug_id = int64(advice.(map[string]interface{})["id"].(float64))
+								}
+								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
+									//prescribing_number = advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+
+								}
+
+								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
+									prescribingNumberUnit, _ = advice.(map[string]interface{})["prescribing_number_unit"].(string)
+								}
+
+								drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, drug_id)
+								if drug.ID == 0 {
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+									return
+								}
+
+								//查询药品的搜有库存
+								list, _ := service.GetDrugWarehouseInfoPrescription(drug_id, adminInfo.CurrentOrgId)
+								var total_count int64
+								for _, it := range list {
+									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
+								}
+								totals := strconv.FormatInt(total_count, 10)
+								all_count, _ := strconv.ParseFloat(totals, 64)
+								fmt.Println("all_count2323323233232", all_count)
+								if prescribingNumberUnit == drug.MinUnit {
+									if prescribing_number > all_count {
+										c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+										//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+										return
+									}
+								} else {
+									if prescribingNumberUnit == drug.MaxUnit {
+										num := prescribing_number * float64(drug.MinNumber)
+										if num > all_count {
+											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+											//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeOutOfStockParamWrong)
+											return
+										}
+									}
+								}
+
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if stockConfig.IsOpen == 1 {
+		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
+			prescriptions, _ := dataBody["prescriptions"].([]interface{})
+			if len(prescriptions) > 0 {
+				for _, item := range prescriptions {
+					items := item.(map[string]interface{})
+					if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
+						projects := items["project"].([]interface{})
+						if len(projects) > 0 {
+							for _, project := range projects {
+								var project_id int64
+								var project_type int64
+								var totals float64
+								if project.(map[string]interface{})["project_id"] != nil || reflect.TypeOf(project.(map[string]interface{})["project_id"]).String() == "float64" {
+									project_id = int64(project.(map[string]interface{})["project_id"].(float64))
+								}
+								if project.(map[string]interface{})["type"] != nil || reflect.TypeOf(project.(map[string]interface{})["type"]).String() == "float64" {
+									project_type = int64(project.(map[string]interface{})["type"].(float64))
+								}
+								if project.(map[string]interface{})["total"] != nil || reflect.TypeOf(project.(map[string]interface{})["total"]).String() == "string" {
+									total, _ := project.(map[string]interface{})["total"].(string)
+
+									totals, _ = strconv.ParseFloat(total, 64)
+								}
+								if project_type == 3 {
+									good, _ := service.FindGoodInfoByIdTwo(project_id)
+									if good.ID == 0 {
+										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+										return
+									}
+									//查询耗材库存
+									list, _ := service.GetGoodWarehouseInfo(project_id)
+									var stock_count int64
+									for _, it := range list {
+										stock_count += it.StockCount
+									}
+									stock_counts := strconv.FormatInt(stock_count, 10)
+									stock_total_count, _ := strconv.ParseFloat(stock_counts, 64)
+									if totals > stock_total_count {
+										c.ServeDynamicFailJsonSend(good.GoodName + "库存不足")
+
+										return
+									}
+
+								}
+
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 
 	info, _ := service.FindHisPatientPrescriptionInfo(adminInfo.CurrentOrgId, patient_id, recordDateTime, p_type, his_patient_id)
 	var hpInfo models.HisPrescriptionInfo

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3911,6 +3911,7 @@ func (c *DialysisAPIController) EditConsumables() {
 						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
 						break
 					}
+
 					var last_total int64
 
 					//如果当前出库数量大于 最后一次出库数量，那么则需要去查询当前批次耗材的库存是否足够
@@ -4580,7 +4581,6 @@ func (c *DialysisAPIController) UpdateStockGoods() {
 //当前数据比上一次出库数据少
 func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, creater int64, count int64) (err error) {
 
-	fmt.Println("w我的中国馆公共区发电房阿道夫安抚安抚安抚安抚安抚安抚阿道夫阿道夫阿凡达阿道夫a", count)
 	//查询该患者当天已经出库的耗材信息
 	goods_yc, _ := service.FindConsumablesByDateThree(orgID, patient_id, record_time)
 	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
@@ -4619,7 +4619,6 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-	fmt.Println("goodsy999999999999", goods_yc)
 
 	//退库
 	if len(goods_yc) > 0 {
@@ -4635,10 +4634,8 @@ func ConsumablesDeliveryTotalSeven(orgID int64, patient_id int64, record_time in
 //耗材出库删除
 func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
-	fmt.Println("count2323223884584854854854u5454785487547845785478758487545475475487,count", count)
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockTwo(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, good_yc.PatientId)
-	fmt.Println("errr232323232323232323232323232", err)
 
 	if err != nil {
 		return err
@@ -4740,7 +4737,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				PatientId:               patient_id,
 			}
 
-			service.UpdatedStockFlow(stockFlow)
+			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
 		}
 
 		if errOne != nil {
@@ -4807,7 +4804,8 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				PatientId:               patient_id,
 				ReturnCount:             delete_count,
 			}
-			service.UpdatedStockFlow(stockFlow)
+			//service.UpdatedStockFlow(stockFlow)
+			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
 		}
 
 	}
@@ -4841,7 +4839,8 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	// 删除出库完成后，要增加对应批次的库存数量
 	fmt.Println("deletecount2323232323232323232323232323", delete_count)
 	errThree := service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count)
-
+	errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
+	fmt.Println("erron2332323232323232232323", errOne)
 	if errThree != nil {
 		return errThree
 	}
@@ -4994,14 +4993,17 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 		stockInInfo, _ := service.FindLastStockInInfoRecord(good_yc.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+
 		if errOne != nil {
 			return errOne
 		}
 
-		//更改自动出库的表格
-
 		// 删除出库完成后，要增加对应批次的库存数量
-		fmt.Println("deletecount2323232323232323232323232323", delete_count)
+		fmt.Println("时间人秘股呢换药2232323223323223322323232323232323232323232323", delete_count)
+
+		// 删除出库完成后，要改变流水库存
+		errOne = service.UpDateWarehouStockFlowByStockDelete(ware.WarehouseInfotId, record_time, good_yc.GoodId, delete_count, good_yc.PatientId)
+		fmt.Println("erron2332323232323232232323", errOne)
 		errThree := service.UpDateWarehouseInfoByStockDelete(ware.WarehouseInfotId, delete_count)
 
 		if errThree != nil {

controllers/stock_in_api_controller.go

@@ -2121,10 +2121,11 @@ func (c *StockManagerApiController) CreateCancelStock() {
 				service.AddSigleCancelStock(&cancelStock)
 			}
 			listcancel, _ := service.GetLastCancelStockById(adminUserInfo.CurrentOrgId)
-			for _, it := range cancelStockInfos {
-				it.CancelStockId = listcancel.ID
-			}
-			errs := service.CreateCancelStockInfo(cancelStockInfos)
+
+			fmt.Println("2332323232323232323", cancelStockInfos)
+			item.CancelStockId = listcancel.ID
+			errs := service.CreateCancelStockInfoOne(item)
+
 			if len(stockFLow) > 0 {
 				service.CreateStockFlow(stockFLow)
 			}
@@ -2144,7 +2145,11 @@ func (c *StockManagerApiController) CreateCancelStock() {
 			}
 			//更改入库数量
 			errs = service.UpdateWareInfoById(item.WarehouseInfoId, item.Count)
-			break
+			if err != nil {
+				utils.ErrorLog(err.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				return
+			}
 		}
 	}
 
@@ -4604,9 +4609,11 @@ func (this *StockManagerApiController) GetOrderDetialByOrderId() {
 	ids := this.GetString("id")
 	idsArray := strings.Split(ids, ",")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
 	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":  list,
+		"order": order,
 	})
 }
 

models/device_models.go

@@ -393,18 +393,19 @@ type Schedules struct {
 }
 
 type XtSchedule struct {
-	ID           int64 `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId    int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	PartitionId  int64 `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId        int64 `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId    int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Status       int64 `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime  int64 `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime  int64 `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	ID              int64                   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId       int64                   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId     int64                   `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId           int64                   `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId       int64                   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate    int64                   `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType    int64                   `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek    int64                   `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId          int64                   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status          int64                   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime     int64                   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime     int64                   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	LastAfterWeight AssessmentAfterDislysis `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 
 func (XtSchedule) TableName() string {

models/dialysis.go

@@ -863,7 +863,7 @@ type XtDialysisOrders struct {
 	FinishModifier int64  `gorm:"column:finish_modifier" json:"finish_modifier" form:"finish_modifier"`
 	SchedualType   int64  `gorm:"column:schedual_type" json:"schedual_type" form:"schedual_type"`
 	Number         string `gorm:"column:number" json:"number" form:"number"`
-	UserName       int64  `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	UserName       string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	WashpipeNurse  int64  `gorm:"column:washpipe_nurse" json:"washpipe_nurse" form:"washpipe_nurse"`
 	ModeId         int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 }

models/drug_stock.go

@@ -325,6 +325,7 @@ type StDrugWarehouseOutInfo struct {
 	LastPrice               string  `json:"last_price"`
 	PackingUnit             string  `json:"packing_unit"`
 	Dosage                  int64   `json:"dosage"`
+	ExpireDate              int64   `json:"expire_date"`
 }
 
 type DrugFlow struct {

models/schedule_models.go

@@ -197,6 +197,7 @@ type VmSchedulesRemind struct {
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 
 func (VmSchedulesRemind) TableName() string {

service/doctor_schedule_service.go

@@ -650,7 +650,7 @@ func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []
 	db := XTReadDB().Table("xt_schedule as s")
 	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Preload("DeviceZone", "status = 1")
-	}).Preload("DialysisOrder", "status =1").
+	}).Preload("DialysisOrder", "status =1").Preload("DialysisPrescription", "status =1").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id And(p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
 	return schedule, err

service/mobile_dialysis_service.go

@@ -1876,7 +1876,7 @@ func MobileGetDialysisGoods(orgID int64, scheduleDate int64, schedule_type int64
 			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0) ", orgID).Where("status = 1 AND user_org_id = ? AND record_date = ?  AND count > 0 ", orgID, scheduleDate)
 		}).
 		Preload("AutomaticReduceDetail", func(db *gorm.DB) *gorm.DB {
-			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
+			return db.Preload("VMGoodInfo", "status = 1 AND org_id = ?  ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Where("status = 1 AND org_id = ? AND count > 0 AND record_time >= ? AND record_time <= ?  ", orgID, scheduleDate, end_time).Group("patient_id,good_id")
 		}).Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)

service/patient_schedule_template_service.go

@@ -422,7 +422,7 @@ func SavePatientScheduleTemplateModeAndClearNextTwoWeekSchedules(templateMode *m
 	nextMonday, _ := utils.GetMondayAndSundayOfWeekDate(&nextWeek)
 	nextSecWeek := now.AddDate(0, 0, 14)
 	_, nextSecSunday := utils.GetMondayAndSundayOfWeekDate(&nextSecWeek)
-	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "mtime": now.Unix()}).Error
+	disableErr := tx.Model(&models.Schedule{}).Where("user_org_id = ? AND status = 1 AND schedule_date >= ? AND schedule_date <= ?", templateMode.OrgID, nextMonday.Unix(), nextSecSunday.Unix()).Updates(map[string]interface{}{"status": 0, "updated_time": now.Unix()}).Error
 	if disableErr != nil {
 		tx.Rollback()
 		return disableErr

service/patient_service.go

@@ -67,7 +67,7 @@ func GetPatientList(orgID int64, keywords string, page, limit, schedulType, bind
 
 	offset := (page - 1) * limit
 
-	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
+	err = db.Order("p.id desc").Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.user_sys_before_count,p.out_reason,p.death_time,p.is_infectious").Group("p.id").Count(&total).Offset(offset).Limit(limit).Find(&patients).Error
 	return
 }
 

service/schedule_service.go

@@ -591,7 +591,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 
 func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -609,6 +609,8 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date =?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
+	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error
 
 	return list, err
@@ -616,7 +618,7 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 
 func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int64, startDate int64, zone []string) (list []*models.VmSchedulesRemind, err error) {
 
-	db := XTReadDB().Table("xt_schedule as x").Where("x.status = 1")
+	db := readDb2.Table("xt_schedule as x").Where("x.status = 1")
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
@@ -634,6 +636,8 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
+	}).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, scheduleDate)
 	}).Find(&list).Error
 
 	return list, err
@@ -987,6 +991,8 @@ func GetDataPrint(orgid int64) (models.XtDataPrint, error) {
 
 func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*models.XtSchedule, err error) {
 
-	err = XTReadDB().Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Find(&schedule).Error
+	err = readDb2.Model(&schedule).Where("schedule_date >=? and schedule_date<=? and status = 1 and user_org_id = ?", startime, endtime, orgid).Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+		return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgid, endtime)
+	}).Find(&schedule).Error
 	return schedule, err
 }

service/stock_service.go

@@ -604,7 +604,7 @@ func GetDrugByWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 func UpdateDrugWarehouseingInfo(id int64, info models.XtDrugWarehouseInfo) error {
 
 	warehouseInfo := models.XtDrugWarehouseInfo{}
-	err := XTReadDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
+	err := XTWriteDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_max_number": info.StockMaxNumber}).Error
 	return err
 }
 
@@ -1605,6 +1605,18 @@ func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error
 
 }
 
+func CreateCancelStockInfoTwo(info *models.DrugCancelStockInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func CreateCancelStockInfoOne(info *models.CancelStockInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
 func CreateDrugCancelStockInfo(cancelStockInfo []*models.DrugCancelStockInfo) (err error) {
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1912,6 +1924,11 @@ func UpDateDrugWarehousingInfo(info *models.DrugWarehouseInfo) (err error) {
 	return err
 }
 
+func UpDateDrugWarehousingInfoTwo(id int64, info *models.DrugWarehouseInfo) (err error) {
+	err = writeDb.Model(&info).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber}).Error
+	return err
+}
+
 func GetDrugWarehouseOrderOne(id int64, drug_id int64) (models.DrugWarehouseInfo, error) {
 
 	info := models.DrugWarehouseInfo{}
@@ -3251,7 +3268,7 @@ func GetAutoMaticReduceDetail(orgid int64, patient_id int64, recordtime int64, g
 func DeleteAutoRedeceDetailTwo(orgid int64, patient_id int64, recordtime int64, goodid int64, goodtypeid int64) error {
 
 	detail := models.BloodAutomaticReduceDetail{}
-	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
 	return err
 }
 
@@ -3260,6 +3277,12 @@ func UpDateWarehouseInfoByStockDelete(id int64, count int64) (err error) {
 	return err
 }
 
+func UpDateWarehouStockFlowByStockDelete(id int64, recordtime int64, good_id int64, count int64, patient_id int64) (err error) {
+
+	err = writeDb.Model(&models.VmStockFlow{}).Where("warehousing_id = ? and system_time = ? and good_id = ? and patient_id = ?", id, recordtime, good_id, patient_id).UpdateColumn("count", gorm.Expr("count - ?", count)).Error
+	return err
+}
+
 func UpDateWarehouseInfoByStockDeleteOne(id int64, count int64) (err error) {
 	err = writeDb.Model(&models.WarehousingInfo{}).Where("id = ?", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
 	return err
@@ -3284,6 +3307,12 @@ func FindGoodInfoByIdTwo(id int64) (goodInfo models.GoodInfo, err error) {
 	return
 }
 
+func GetGoodWarehouseInfo(good_id int64) (info []*models.WarehousingInfo, err error) {
+
+	err = readDb.Where("good_id = ? and status = 1 and stock_count<>0", good_id).Find(&info).Error
+	return info, err
+}
+
 func GetAllStockList(page int64, limit int64, startime int64, endtime int64, good_type int64, keyword string, orgid int64) (info []*models.VmWarehousingInfo, total int64, err error) {
 
 	offset := (page - 1) * limit
@@ -3505,7 +3534,7 @@ func FindUserDetailByIdOne(good_id int64, record_time int64, org_id int64) (user
 	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.Where("status = 1 AND org_id = ? AND good_id = ? AND record_time = ? and count<> 0 ", org_id, good_id, record_time)
 	db = db.Count(&total)
 	err = db.Find(&user).Error
 
@@ -3934,7 +3963,7 @@ func GetStockFlowBatchNumber(id int64, goodid int64) (stock []*models.VmStockFlo
 
 func GetStockFlowBatchNumberOne(id int64, goodid int64) (stock []*models.VmStockFlowOne, err error) {
 
-	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_stock_flow as x").Where("x.status = 1 and count > 0")
 	table := XTReadDB().Table("xt_patients as t").Where("t.status = 1")
 	fmt.Println(table)
 	tableone := XTReadDB().Table("xt_good_information as o").Where("o.status = 1")
@@ -3989,7 +4018,7 @@ func GetExportOutOrderDrugListOne(warehouse_out_id []string) (out []*models.StDr
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehouse_out_id in(?)", warehouse_out_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date as expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.max_unit as count_unit,x.price,x.product_date,x.expire_date,x.warehouse_out_order_number,x.dealer,x.manufacturer,x.is_sys,x.number,x.batch_number,x.patient_id,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,b.min_price").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }
 
@@ -4095,6 +4124,12 @@ func UpdatedStockFlow(flow models.VmStockFlow) error {
 	return err
 }
 
+func UpdatedStockFlowOne(flow models.VmStockFlow, warehousing_id int64, patient_id int64, record_time int64, good_id int64) error {
+
+	err = XTWriteDB().Model(&flow).Where("warehousing_id = ? and patient_id = ? and system_time = ? and good_id = ? and status = 1", warehousing_id, patient_id, record_time, good_id).Updates(map[string]interface{}{"number": flow.Number, "license_number": flow.LicenseNumber, "count": flow.Count, "expire_date": flow.ExpireDate, "product_date": flow.ProductDate, "price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer}).Error
+	return err
+}
+
 func GetStockFlowIsExsit(warehousing_id int64, patient_id int64, record_time int64, good_id int64) (*models.VmStockFlow, error) {
 
 	stock := models.VmStockFlow{}
@@ -4353,6 +4388,12 @@ func GetDrugWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 	return info, err
 }
 
+func GetDrugWarehouseInfoPrescription(drugid int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("drug_id = ? and org_id =? and status = 1", drugid, orgid).Find(&info).Error
+	return info, err
+}
+
 func GetDrugWarehouseInfoById(id int64) (models.XtDrugWarehouseInfo, error) {
 
 	info := models.XtDrugWarehouseInfo{}
@@ -5033,3 +5074,17 @@ func GetInventoryExportList(orgid int64) (info []*models.PatientWarehouseInfo, e
 	err = db.Select("x.id,x.good_id,x.number,x.number,x.product_date,x.expiry_date,x.warehousing_unit,x.dealer,x.manufacturer,t.good_name,t.specification_name,t.packing_unit,t.remark").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id,x.number").Scan(&info).Error
 	return info, err
 }
+
+func GetDrugWarehouseingInfo(id int64) (models.XtDrugWarehouseInfo, error) {
+
+	info := models.XtDrugWarehouseInfo{}
+	err := XTReadDB().Where("id=? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
+func UpdateDrugWarehouseingInfoSix(id int64, info models.XtDrugWarehouseInfo) error {
+
+	warehouseInfo := models.XtDrugWarehouseInfo{}
+	err := XTWriteDB().Model(&warehouseInfo).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit}).Error
+	return err
+}

service/warhouse_service.go

@@ -836,14 +836,15 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if errOne != nil {
 			return errOne
 		}
-		list, _ := GetLastWarehouseOut(drup.OrgId)
+		fmt.Println("hh233223323223232323233223232323233223232323", warehouseout.ID, warehouseout.WarehouseOutOrderNumber)
+		//list, _ := GetLastWarehouseOut(drup.OrgId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          list.ID,
+			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
-			ProductDate:             warehouse.ProductDate,
-			ExpireDate:              warehouse.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
 			Count:                   deliver_number,
 			Price:                   advice.Price,
 			Status:                  1,
@@ -929,14 +930,14 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		if errOne != nil {
 			return errOne
 		}
-		list, _ := GetLastWarehouseOut(drup.OrgId)
+		//list, _ := GetLastWarehouseOut(drup.OrgId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          list.ID,
+			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
-			ProductDate:             warehouse.ProductDate,
-			ExpireDate:              warehouse.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			ExpireDate:              advice.ExpiryDate,
 			Count:                   deliver_number,
 			Price:                   advice.Price,
 			Status:                  1,
@@ -1079,9 +1080,6 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 //耗材出库
 func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
 
-	fmt.Println("count23232323232323232323232323", count)
-	fmt.Println("hhhh2h3h3h2h23h32hh23h32h23", goods.Count)
-	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
 	var maxNumber int64 = 0
@@ -1097,7 +1095,6 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		return errors.New("库存数量不足")
 	}
 
-	// 将该批次的剩余库存数量转换为拆零数量
 	stock_number = warehouse.StockCount
 
 	//获取耗材信息
@@ -1185,7 +1182,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				PatientId:               patient_id,
 			}
 			//查询流水是否存在
-			exsit, errflow := GetStockFlowIsExsit(warehouseOut.ID, patient_id, record_time, goods.GoodId)
+			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 
 			fmt.Println("什么数据233232323", errflow)
 			if errflow == gorm.ErrRecordNotFound {
@@ -1220,7 +1217,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
-				errFour := UpdatedStockFlow(flow)
+
+				errFour := UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 				if errFour != nil {
 					return errFour
 				}
@@ -1252,7 +1250,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				PatientId:               patient_id,
 			}
 			//查询流水是否存在
-			exsit, errflow := GetStockFlowIsExsit(warehouseOut.ID, patient_id, record_time, goods.GoodId)
+			exsit, errflow := GetStockFlowIsExsit(warehouse.ID, patient_id, record_time, goods.GoodId)
 
 			if errflow == gorm.ErrRecordNotFound {
 				CreateStockFlowOne(flow)
@@ -1285,7 +1283,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
-				UpdatedStockFlow(flow)
+				//UpdatedStockFlow(flow)
+				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 				DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
 				CreateAutoReduceRecord(&details)
 			}
@@ -1403,7 +1402,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					PatientId:               patient_id,
 					ReturnCount:             exsit.Count + (exsit.Count + deliver_number),
 				}
-				UpdatedStockFlow(flow)
+				//UpdatedStockFlow(flow)
+				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 			}
 
 		} else if errcodes == nil {
@@ -1468,7 +1468,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					IsSys:                   1,
 					PatientId:               patient_id,
 				}
-				UpdatedStockFlow(flow)
+				//UpdatedStockFlow(flow)
+				UpdatedStockFlowOne(flow, warehouse.ID, patient_id, record_time, goods.GoodId)
 			}
 		}