11月8日库存管理

controllers/base_controller.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"XT_New/service"
-
 	"github.com/astaxie/beego"
 )
 

controllers/dialysis_api_controller.go

@@ -3458,7 +3458,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 			}
 
 			if template.TemplateId == 47 { //adminInfo.CurrentOrgId == 9538
-				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
@@ -3490,6 +3490,10 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
+	if template.TemplateId == 47 {
+		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"monitor": record,
 	})

controllers/dialysis_record_api_controller.go

@@ -999,7 +999,11 @@ func (this *DialysisRecordAPIController) StartDialysis() {
 
 		var tempdispose string
 		// 只针对中能建
-		if blood_drawing > 0 { //adminUserInfo.CurrentOrgId == 9538
+		if blood_drawing > 0 && adminUserInfo.CurrentOrgId == 9538 { //adminUserInfo.CurrentOrgId == 9538
+			tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
+		}
+
+		if blood_drawing > 0 && adminUserInfo.CurrentOrgId == 10318 { //adminUserInfo.CurrentOrgId == 9538
 			tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
 		}
 

controllers/gobal_config_api_controller.go

@@ -1602,6 +1602,7 @@ func (c *GobalConfigApiController) GetDrugInDetail() {
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	storehouse_id, _ := c.GetInt64("storehouse_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1631,10 +1632,11 @@ func (c *GobalConfigApiController) GetDrugInDetail() {
 	page, _ := c.GetInt64("page")
 	limit, _ := c.GetInt64("limit")
 
-	detail, total, err := service.GetDrugInOrderDetail(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+	detail, total, err := service.GetDrugInOrderDetail(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
+	houseList, _ := service.GetAllStorehouseName(adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -1643,6 +1645,7 @@ func (c *GobalConfigApiController) GetDrugInDetail() {
 		"detail":         detail,
 		"total":          total,
 		"drugTypeParent": drugTypeList,
+		"houseList":      houseList,
 	})
 }
 
@@ -1694,6 +1697,7 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	storehouse_id, _ := c.GetInt64("storehouse_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1722,7 +1726,8 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 	keyword := c.GetString("keyword")
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
-	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+	order, total, err := service.GetDrugOutOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
+	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
@@ -1734,6 +1739,7 @@ func (c *GobalConfigApiController) GetDrugOutDetail() {
 		"order":        order,
 		"total":        total,
 		"drugTypeList": drugTypeList,
+		"houseList":    houseList,
 	})
 }
 
@@ -1741,6 +1747,7 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
+	storehouse_id, _ := c.GetInt64("storehouse_id")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -1769,11 +1776,12 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 	keyword := c.GetString("keyword")
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
-	orderPrint, _ := service.GetDrugCancelOrderPrint(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword)
-	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit)
+	orderPrint, _ := service.GetDrugCancelOrderPrint(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, storehouse_id)
+	order, total, err := service.GetDrugCancelOrder(startTime, endTime, adminInfo.CurrentOrgId, order_type, manufacturer_id, keyword, page, limit, storehouse_id)
 	var drugType = "药品类型"
 	drugTypeParent, _ := service.GetDrugDataConfig(0, drugType)
 	drugTypeList, _ := service.GetParentDataConfig(drugTypeParent.ID, adminInfo.CurrentOrgId)
+	houseList, _ := service.GetAllStoreHouseList(adminInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -1783,6 +1791,7 @@ func (c *GobalConfigApiController) GetDrugCancelDetail() {
 		"total":        total,
 		"orderPrint":   orderPrint,
 		"drugTypeList": drugTypeList,
+		"houseList":    houseList,
 	})
 }
 
@@ -1920,7 +1929,8 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	end_time := c.GetString("end_time")
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
-
+	storehouse_id, _ := c.GetInt64("storehouse_id")
+	drug_id, _ := c.GetInt64("drug_id")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -1943,9 +1953,13 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	}
 	adminUserInfo := c.GetAdminUserInfo()
 
-	list, total, err := service.GetAllBaseDurgListCount(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId)
+	list, total, err := service.GetAllBaseDurgListCount(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId, storehouse_id, drug_id)
 
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+
+	houseList, _ := service.GetAllStoreHouseListOne(adminUserInfo.CurrentOrgId)
+
+	medicalList, _ := service.GetAllBaseDrugStockList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -1954,6 +1968,8 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 		"list":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
+		"houseList":        houseList,
+		"medicalList":      medicalList,
 	})
 }
 
@@ -2063,6 +2079,7 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 
 	drug, _ := service.GetBaseDrugMedical(drug_id)
+	houseList, _ := service.GetAllStoreHouseList(orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -2072,6 +2089,7 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 		"total":            total,
 		"manufacturerList": manufacturerList,
 		"drug":             drug,
+		"houseList":        houseList,
 	})
 }
 
@@ -2137,6 +2155,7 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	drugFlowList, _ := service.GetDrugStockFlowDetail(start_time, orgId)
 	flowlist, _ := service.GetSingeOrderFlow(id, orgId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -2288,12 +2307,14 @@ func (c *GobalConfigApiController) GetDrugFlow() {
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	dealerList, _ := service.GetAllDealerList(orgId)
 	medical, _ := service.GetBaseDrugMedical(drug_id)
+	houseList, _ := service.GetAllStoreHouseList(orgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
 		"dealerList":       dealerList,
 		"drug":             medical,
+		"houseList":        houseList,
 	})
 }
 

controllers/his_api_controller.go

@@ -720,9 +720,10 @@ func (c *HisApiController) CreateHisPrescription() {
 						if len(advices) > 0 {
 							for _, advice := range advices {
 								var drug_id int64
-								var prescribing_number float64
+								//var prescribing_number float64
 								var prescribingNumberUnit string
 								var prescribingNumber string
+								var prescribing_number_one int64
 
 								var adviceId int64
 								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
@@ -730,8 +731,9 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
 									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
-									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
+									//prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
 									prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
+									prescribing_number_one, _ = strconv.ParseInt(prescribing_number_str, 10, 64)
 								}
 
 								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
@@ -748,27 +750,27 @@ func (c *HisApiController) CreateHisPrescription() {
 									return
 								}
 								//查询药品的所有库存
-								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(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)
+								//list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(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)
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
 
 								//新增处方
 								if advicelist.ID == 0 {
-									all_count, _ := strconv.ParseFloat(totals, 64)
+									//	all_count, _ := strconv.ParseFloat(totals, 64)
 									if prescribingNumberUnit == drug.MinUnit {
-										if prescribing_number > all_count {
+										if prescribing_number_one > drug.SumCount {
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											return
 										}
 									} else {
 										if prescribingNumberUnit == drug.MaxUnit {
-											num := prescribing_number * float64(drug.MinNumber)
-											if num > all_count {
+											num := prescribing_number_one * drug.MinNumber
+											if num > drug.SumCount {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
 											}
@@ -803,7 +805,7 @@ func (c *HisApiController) CreateHisPrescription() {
 									//如果修改的数量大于之前修改的数量
 									if (number_count - device_number) > 0 {
 										//如果修改的差数量 大于库存数量
-										if (number_count - device_number) > total_count {
+										if (number_count - device_number) > drug.SumCount {
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											return
 										}
@@ -818,6 +820,24 @@ func (c *HisApiController) CreateHisPrescription() {
 										if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
 											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
+
+											//查询默认仓库
+											houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
+											//查询默认仓库剩余多少库存
+											list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
+											var sum_count int64
+											var sum_in_count int64
+											for _, it := range list {
+												baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+												if it.MaxUnit == baseDrug.MaxUnit {
+													it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+													it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+
+												}
+												sum_count += it.StockMaxNumber + it.StockMinNumber
+												sum_in_count += it.WarehousingCount
+											}
+											service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 										}
 										if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
 											var stock_max_number int64
@@ -826,18 +846,71 @@ func (c *HisApiController) CreateHisPrescription() {
 											if number_count >= drug.MinNumber {
 
 												stock_max_number = device_number / drug.MinNumber
+
 												service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
+
 												stock_min_number = device_number % drug.MinNumber
 												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
+												//查询默认仓库
+												houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
+												//查询默认仓库剩余多少库存
+												list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
+												var sum_count int64
+												var sum_in_count int64
+												for _, it := range list {
+													baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+													if it.MaxUnit == baseDrug.MaxUnit {
+														it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+														it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+
+													}
+													sum_count += it.StockMaxNumber + it.StockMinNumber
+													sum_in_count += it.WarehousingCount
+												}
+												service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 
 											} else {
 
 												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
+												//查询默认仓库
+												houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
+												//查询默认仓库剩余多少库存
+												list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
+												var sum_count int64
+												var sum_in_count int64
+												for _, it := range list {
+													baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+													if it.MaxUnit == baseDrug.MaxUnit {
+														it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+														it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+
+													}
+													sum_count += it.StockMaxNumber + it.StockMinNumber
+													sum_in_count += it.WarehousingCount
+												}
+												service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 											}
 										}
 
 										if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
 											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
+											//查询默认仓库
+											houseConfig, _ := service.GetAllStoreHouseConfig(druginfo.OrgId)
+											//查询默认仓库剩余多少库存
+											list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, druginfo.OrgId, drug_id)
+											var sum_count int64
+											var sum_in_count int64
+											for _, it := range list {
+												baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+												if it.MaxUnit == baseDrug.MaxUnit {
+													it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+													it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+
+												}
+												sum_count += it.StockMaxNumber + it.StockMinNumber
+												sum_in_count += it.WarehousingCount
+											}
+											service.UpdateMedicalSumCount(drug_id, sum_count, sum_in_count, druginfo.OrgId)
 										}
 										//删除记录
 										service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
@@ -867,7 +940,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								var project_id int64
 								var project_type int64
-								var totals float64
+								//var totals float64
 								var project_name string
 								var parsetotal int64
 								var id int64
@@ -883,7 +956,7 @@ func (c *HisApiController) CreateHisPrescription() {
 								}
 								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)
+									//	totals, _ = strconv.ParseFloat(total, 64)
 									parsetotal, _ = strconv.ParseInt(total, 10, 64)
 								}
 
@@ -902,14 +975,20 @@ func (c *HisApiController) CreateHisPrescription() {
 
 									if len(goodWarehouseInfo) == 0 {
 										//查询耗材库存
-										list, _ := service.GetGoodWarehouseInfoSeven(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 {
+										//list, _ := service.GetGoodWarehouseInfoSeven(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(project_name + "库存不足")
+										//	return
+										//}
+
+										good, _ := service.GetGoodInformationByGoodId(project_id)
+										if parsetotal > good.SumCount {
 											c.ServeDynamicFailJsonSend(project_name + "库存不足")
 											return
 										}
@@ -919,6 +998,16 @@ func (c *HisApiController) CreateHisPrescription() {
 										for _, item := range goodList {
 											//回退库存
 											service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
+											//查询默认仓库
+											houseConfig, _ := service.GetAllStoreHouseConfig(item.GoodId)
+											goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.OrgId)
+											var sum_count int64
+											var sum_in_count int64
+											for _, it := range goodList {
+												sum_count += it.StockCount
+												sum_in_count += it.WarehousingCount
+											}
+											service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
 										}
 										//删除记录
 										service.DeleteAutoWarehouse(patient_id, recordDateTime)
@@ -937,6 +1026,16 @@ func (c *HisApiController) CreateHisPrescription() {
 											for _, item := range goodList {
 												//回退库存
 												service.ModefyWarehouseInfo(item.Count, item.WarehouseInfotId)
+												//查询默认仓库
+												houseConfig, _ := service.GetAllStoreHouseConfig(item.GoodId)
+												goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.OrgId)
+												var sum_count int64
+												var sum_in_count int64
+												for _, it := range goodList {
+													sum_count += it.StockCount
+													sum_in_count += it.WarehousingCount
+												}
+												service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
 											}
 											//删除记录
 											service.DeleteAutoWarehouse(patient_id, recordDateTime)
@@ -1641,7 +1740,7 @@ func (c *HisApiController) DeletePrescription() {
 	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
 
 	_, stockConfig := service.FindAutomaticReduceRecordByOrgId(c.GetAdminUserInfo().CurrentOrgId)
-
+	houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 	if len(projects) > 0 {
 		for _, item := range projects {
 			service.DeletePrintInfo(item.ID) //删除打印信息
@@ -1661,14 +1760,15 @@ func (c *HisApiController) DeletePrescription() {
 					orderNumber := "CKTKD" + strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
 					cancelStock := models.CancelStock{
-						OrderNumber: orderNumber,
-						OperaTime:   operation_time,
-						OrgId:       c.GetAdminUserInfo().CurrentOrgId,
-						Creater:     creater,
-						Ctime:       time.Now().Unix(),
-						Status:      1,
-						ReturnTime:  item.RecordDate,
-						Type:        1,
+						OrderNumber:  orderNumber,
+						OperaTime:    operation_time,
+						OrgId:        c.GetAdminUserInfo().CurrentOrgId,
+						Creater:      creater,
+						Ctime:        time.Now().Unix(),
+						Status:       1,
+						ReturnTime:   item.RecordDate,
+						Type:         1,
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 					_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(item.RecordDate, c.GetAdminUserInfo().CurrentOrgId)
 					if msgerrkonde == gorm.ErrRecordNotFound {
@@ -1704,6 +1804,7 @@ func (c *HisApiController) DeletePrescription() {
 							WarehouseInfoId: info.WarehouseInfotId,
 							PatientId:       info.PatientId,
 							RecordDate:      info.SysRecordTime,
+							StorehouseId:    houseConfig.StorehouseOutInfo,
 						}
 
 						service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -1740,6 +1841,7 @@ func (c *HisApiController) DeletePrescription() {
 							CancelOutDetailId:       cancelInfo.ID,
 							ProductDate:             info.ProductDate,
 							ExpireDate:              info.ExpiryDate,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						service.CreateStockFlowOne(flow)
 
@@ -1757,7 +1859,7 @@ func (c *HisApiController) DeletePrescription() {
 						}
 						//回退库存
 						service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count)
-
+						service.ModifyGoodAddInformation(info.GoodId, total_count, info.OrgId)
 						//查询今日该耗材退库数量
 						cancelInfoOne, _ := service.GetCancelStockInfoByPatientId(info.PatientId, item.ProjectId, info.SysRecordTime)
 						var cancel_Count int64
@@ -1792,6 +1894,7 @@ func (c *HisApiController) DeletePrescription() {
 									Manufacturer:            0,
 									Type:                    1,
 									IsSys:                   1,
+									StorehouseId:            houseConfig.StorehouseOutInfo,
 								}
 								err := service.AddSigleWarehouseOut(&warehouseOut)
 								if err != nil {
@@ -1799,24 +1902,26 @@ func (c *HisApiController) DeletePrescription() {
 									return
 								}
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:  info.PatientId,
-									RecordDate: info.SysRecordTime,
-									GoodId:     item.ProjectId,
-									GoodTypeId: info.GoodTypeId,
-									Count:      cha_count,
+									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:    info.PatientId,
+									RecordDate:   info.SysRecordTime,
+									GoodId:       item.ProjectId,
+									GoodTypeId:   info.GoodTypeId,
+									Count:        cha_count,
+									StorehouseId: houseConfig.StorehouseOutInfo,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
 							} else if err == nil {
 
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:  info.PatientId,
-									RecordDate: info.SysRecordTime,
-									GoodId:     item.ProjectId,
-									GoodTypeId: info.GoodTypeId,
-									Count:      cha_count,
+									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:    info.PatientId,
+									RecordDate:   info.SysRecordTime,
+									GoodId:       item.ProjectId,
+									GoodTypeId:   info.GoodTypeId,
+									Count:        cha_count,
+									StorehouseId: houseConfig.StorehouseOutInfo,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
@@ -1866,7 +1971,7 @@ func (c *HisApiController) DeletePrescription() {
 						}
 
 						service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
-
+						service.ModifyDrugAddInformation(info.DrugId, warehouseInfo.StockMinNumber, warehouseInfo.OrgId)
 						adminUserInfo := c.GetAdminUserInfo()
 						operation_time := time.Now().Unix()
 						creater := adminUserInfo.AdminUser.Id
@@ -1889,6 +1994,7 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -1917,6 +2023,7 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -1952,6 +2059,7 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -1968,9 +2076,12 @@ func (c *HisApiController) DeletePrescription() {
 						if item.PrescribingNumberUnit == drug.MaxUnit {
 							warehouseInfo := models.DrugWarehouseInfo{
 								StockMaxNumber: prescribingNumber,
+								StorehouseId:   houseConfig.DrugStorehouseOut,
 							}
 							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-
+							var sum_count int64
+							sum_count = prescribingNumber * drug.MinNumber
+							service.ModifyDrugAddInformation(info.DrugId, sum_count, info.OrgId)
 						}
 
 						adminUserInfo := c.GetAdminUserInfo()
@@ -1995,6 +2106,7 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2024,6 +2136,7 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2060,6 +2173,7 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2110,7 +2224,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 		if drugStockConfig.IsOpen == 1 {
 			//判断该医嘱是否执行了
 			if advice.ExecutionState == 1 {
-
+				houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
 				//查询该病人该药品是否有库存记录
 				info, errcode := service.GetDrugAutoWarehouseOutSeven(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
 				if errcode == gorm.ErrRecordNotFound {
@@ -2129,7 +2243,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						}
 
 						service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
-
+						service.ModifyDrugAddInformation(info.DrugId, warehouseInfo.StockMinNumber, info.OrgId)
 						adminUserInfo := c.GetAdminUserInfo()
 						operation_time := time.Now().Unix()
 						creater := adminUserInfo.AdminUser.Id
@@ -2152,6 +2266,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2180,6 +2295,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2215,6 +2331,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2233,8 +2350,10 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							warehouseInfo := models.DrugWarehouseInfo{
 								StockMaxNumber: prescribingNumber,
 							}
+							var sum_count int64
+							sum_count = prescribingNumber * drug.MinNumber
 							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-
+							service.ModifyDrugAddInformation(info.DrugId, sum_count, info.OrgId)
 						}
 
 						adminUserInfo := c.GetAdminUserInfo()
@@ -2259,6 +2378,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2287,6 +2407,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2322,6 +2443,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2366,6 +2488,7 @@ func (c *HisApiController) DeleteProject() {
 		if project.Type == 3 {
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)
+			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good.Total = good.Total + f_count
 			service.UpdateGoodInfo(&good)
 
@@ -2379,14 +2502,15 @@ func (c *HisApiController) DeleteProject() {
 			orderNumber := "CKTKD" + strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
 			cancelStock := models.CancelStock{
-				OrderNumber: orderNumber,
-				OperaTime:   operation_time,
-				OrgId:       adminInfo.CurrentOrgId,
-				Creater:     creater,
-				Ctime:       time.Now().Unix(),
-				Status:      1,
-				ReturnTime:  project.RecordDate,
-				Type:        1,
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        adminInfo.CurrentOrgId,
+				Creater:      creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   project.RecordDate,
+				Type:         1,
+				StorehouseId: houseConfig.StorehouseOutInfo,
 			}
 			_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(project.RecordDate, adminInfo.CurrentOrgId)
 			if msgerrkonde == gorm.ErrRecordNotFound {
@@ -2423,6 +2547,7 @@ func (c *HisApiController) DeleteProject() {
 					WarehouseInfoId: info.WarehouseInfotId,
 					PatientId:       info.PatientId,
 					RecordDate:      info.SysRecordTime,
+					StorehouseId:    houseConfig.StorehouseOutInfo,
 				}
 
 				service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -2459,6 +2584,7 @@ func (c *HisApiController) DeleteProject() {
 					CancelOutDetailId:       cancelInfo.ID,
 					ProductDate:             info.ProductDate,
 					ExpireDate:              info.ExpiryDate,
+					StorehouseId:            houseConfig.StorehouseOutInfo,
 				}
 				service.CreateStockFlowOne(flow)
 
@@ -2476,7 +2602,7 @@ func (c *HisApiController) DeleteProject() {
 				}
 				//回退库存
 				service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count)
-
+				service.ModifyGoodAddInformation(info.GoodId, total_count, info.OrgId)
 				//查询今日该耗材退库数量
 				cancelInfoOne, _ := service.GetCancelStockInfoByPatientId(info.PatientId, project.ProjectId, info.SysRecordTime)
 				var cancel_count int64
@@ -2511,6 +2637,7 @@ func (c *HisApiController) DeleteProject() {
 							Manufacturer:            0,
 							Type:                    1,
 							IsSys:                   1,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						err := service.AddSigleWarehouseOut(&warehouseOut)
 						if err != nil {
@@ -2518,23 +2645,25 @@ func (c *HisApiController) DeleteProject() {
 							return
 						}
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:  adminInfo.CurrentOrgId,
-							PatientId:  info.PatientId,
-							RecordDate: info.SysRecordTime,
-							GoodId:     project.ProjectId,
-							GoodTypeId: info.GoodTypeId,
-							Count:      cha_count,
+							UserOrgId:    adminInfo.CurrentOrgId,
+							PatientId:    info.PatientId,
+							RecordDate:   info.SysRecordTime,
+							GoodId:       project.ProjectId,
+							GoodTypeId:   info.GoodTypeId,
+							Count:        cha_count,
+							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
 					} else if err == nil {
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:  adminInfo.CurrentOrgId,
-							PatientId:  info.PatientId,
-							RecordDate: info.SysRecordTime,
-							GoodId:     project.ProjectId,
-							GoodTypeId: info.GoodTypeId,
-							Count:      cha_count,
+							UserOrgId:    adminInfo.CurrentOrgId,
+							PatientId:    info.PatientId,
+							RecordDate:   info.SysRecordTime,
+							GoodId:       project.ProjectId,
+							GoodTypeId:   info.GoodTypeId,
+							Count:        cha_count,
+							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -264,7 +264,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 47 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2254,7 +2254,11 @@ func (this *DialysisAPIController) StartDialysis() {
 
 	var tempdispose string
 	// 只针对中能建
-	if blood_drawing > 0 {
+	if blood_drawing > 0 && adminUserInfo.Org.Id == 9538 {
+		tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
+	}
+
+	if blood_drawing > 0 && adminUserInfo.Org.Id == 10318 {
 		tempdispose = "引血" + strconv.FormatInt(blood_drawing, 10) + "ml/min"
 	}
 
@@ -2885,7 +2889,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 41 {
+			if template.TemplateId == 41 || template.TemplateId == 47 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin) * 1000)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -2894,6 +2898,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
+			if template.TemplateId == 46 {
+				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
+				record.UltrafiltrationRate = ultrafiltration_rate
+			}
 
 			if template.TemplateId == 47 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
@@ -2912,7 +2920,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -2920,6 +2928,10 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
+	if template.TemplateId == 47 {
+		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
+	}
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"monitor": record,
 	})
@@ -3894,6 +3906,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 		return
 	}
 
+	houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+
 	var beforePrepares []*models.DialysisBeforePrepareGoods
 	var newBeforePrepares []*models.NewDialysisBeforePrepareGoods
 	var dialysisBefor []*models.DialysisBeforePrepare
@@ -3929,17 +3943,19 @@ func (c *DialysisAPIController) CreateConsumables() {
 				fmt.Println("commdity", commdity_code)
 
 				prepareGoods := &models.DialysisBeforePrepareGoods{
-					GoodTypeId: good_type_id,
-					GoodId:     good_id,
-					Count:      count,
+					GoodTypeId:   good_type_id,
+					GoodId:       good_id,
+					Count:        count,
+					StorehouseId: houseConfig.StorehouseOutInfo,
 				}
 
 				beforePrepares = append(beforePrepares, prepareGoods)
 
 				newPrepareGoods := &models.NewDialysisBeforePrepareGoods{
-					GoodTypeId: good_type_id,
-					GoodId:     good_id,
-					Count:      count,
+					GoodTypeId:   good_type_id,
+					GoodId:       good_id,
+					Count:        count,
+					StorehouseId: houseConfig.StorehouseOutInfo,
 				}
 
 				newBeforePrepares = append(newBeforePrepares, newPrepareGoods)
@@ -3955,6 +3971,7 @@ func (c *DialysisAPIController) CreateConsumables() {
 					Ctime:        time.Now().Unix(),
 					Creater:      adminUser.AdminUser.Id,
 					CommdityCode: commdity_code,
+					StorehouseId: houseConfig.StorehouseOutInfo,
 				}
 
 				dialysisBefor = append(dialysisBefor, prepare)
@@ -3964,7 +3981,8 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 		//查询是否有库存
 		for _, item := range dialysisBefor {
-			_, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId)
+			fmt.Println("houseconfig233232323232232332323223233", houseConfig.StorehouseOutInfo)
+			_, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId, houseConfig.StorehouseOutInfo)
 
 			if err == gorm.ErrRecordNotFound {
 				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
@@ -4002,11 +4020,21 @@ func (c *DialysisAPIController) CreateConsumables() {
 					Creater:      item.Creater,
 					CommdityCode: item.CommdityCode,
 					Status:       1,
+					StorehouseId: houseConfig.StorehouseOutInfo,
 				}
 				//先清除再插入
 				service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 				err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
-
+				//查询默认仓库
+				houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+				goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+				var sum_count int64
+				var sum_in_count int64
+				for _, it := range goodList {
+					sum_count += it.StockCount
+					sum_in_count += it.WarehousingCount
+				}
+				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
 			}
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
@@ -4040,15 +4068,16 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 					for _, it := range list {
 						prepare := models.DialysisBeforePrepare{
-							UserOrgId:  it.OrgId,
-							PatientId:  patient_id,
-							RecordDate: it.RecordTime,
-							GoodId:     it.GoodId,
-							GoodTypeId: it.GoodTypeId,
-							Count:      it.Count,
-							Ctime:      time.Now().Unix(),
-							Creater:    adminUser.AdminUser.Id,
-							Status:     1,
+							UserOrgId:    it.OrgId,
+							PatientId:    patient_id,
+							RecordDate:   it.RecordTime,
+							GoodId:       it.GoodId,
+							GoodTypeId:   it.GoodTypeId,
+							Count:        it.Count,
+							Ctime:        time.Now().Unix(),
+							Creater:      adminUser.AdminUser.Id,
+							Status:       1,
+							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
 						//删除准备表数据
 						service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
@@ -4081,21 +4110,31 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 						for _, it := range list {
 							prepare := models.DialysisBeforePrepare{
-								UserOrgId:  it.OrgId,
-								PatientId:  patient_id,
-								RecordDate: it.RecordTime,
-								GoodId:     it.GoodId,
-								GoodTypeId: it.GoodTypeId,
-								Count:      it.Count,
-								Ctime:      time.Now().Unix(),
-								Creater:    adminUser.AdminUser.Id,
-								Status:     1,
+								UserOrgId:    it.OrgId,
+								PatientId:    patient_id,
+								RecordDate:   it.RecordTime,
+								GoodId:       it.GoodId,
+								GoodTypeId:   it.GoodTypeId,
+								Count:        it.Count,
+								Ctime:        time.Now().Unix(),
+								Creater:      adminUser.AdminUser.Id,
+								Status:       1,
+								StorehouseId: houseConfig.StorehouseOutInfo,
 							}
 							//删除准备表数据
 							service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 
 							service.CreateDialysisBeforePrepareOne(&prepare)
-
+							//查询默认仓库
+							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+							var sum_count int64
+							var sum_in_count int64
+							for _, it := range goodList {
+								sum_count += it.StockCount
+								sum_in_count += it.WarehousingCount
+							}
+							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
 						}
 					}
 
@@ -4107,21 +4146,31 @@ func (c *DialysisAPIController) CreateConsumables() {
 
 						for _, it := range list {
 							prepare := models.DialysisBeforePrepare{
-								UserOrgId:  it.OrgId,
-								PatientId:  patient_id,
-								RecordDate: it.RecordTime,
-								GoodId:     it.GoodId,
-								GoodTypeId: it.GoodTypeId,
-								Count:      it.Count,
-								Ctime:      time.Now().Unix(),
-								Creater:    adminUser.AdminUser.Id,
-								Status:     1,
+								UserOrgId:    it.OrgId,
+								PatientId:    patient_id,
+								RecordDate:   it.RecordTime,
+								GoodId:       it.GoodId,
+								GoodTypeId:   it.GoodTypeId,
+								Count:        it.Count,
+								Ctime:        time.Now().Unix(),
+								Creater:      adminUser.AdminUser.Id,
+								Status:       1,
+								StorehouseId: houseConfig.StorehouseOutInfo,
 							}
 							//删除准备表数据
 							service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 
 							service.CreateDialysisBeforePrepareOne(&prepare)
-
+							//查询默认仓库
+							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminUser.Org.Id)
+							var sum_count int64
+							var sum_in_count int64
+							for _, it := range goodList {
+								sum_count += it.StockCount
+								sum_in_count += it.WarehousingCount
+							}
+							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
 						}
 						if err != nil {
 							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
@@ -4189,10 +4238,10 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 	consumables = RemoveRepeatedGood(consumables)
 
 	if record.IsOpen == 1 {
-
+		houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 		//查询是否有库存
 		for _, item := range consumables {
-			warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+			warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, houseConfig.StorehouseOutInfo)
 
 			if item.Count > warehouse.Count {
 				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
@@ -4230,6 +4279,7 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				Manufacturer:            0,
 				Type:                    1,
 				IsSys:                   1,
+				StorehouseId:            houseConfig.StorehouseOutInfo,
 			}
 			err := service.AddSigleWarehouseOut(&warehouseOut)
 			if err != nil {
@@ -4248,19 +4298,30 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				}
 				for _, item := range list {
 					prepare := models.DialysisBeforePrepare{
-						UserOrgId:  adminInfo.Org.Id,
-						PatientId:  patient_id,
-						RecordDate: record_time,
-						GoodId:     item.GoodId,
-						GoodTypeId: item.GoodTypeId,
-						Count:      item.Count,
-						Creater:    adminInfo.AdminUser.Id,
-						Status:     1,
-						Ctime:      time.Now().Unix(),
+						UserOrgId:    adminInfo.Org.Id,
+						PatientId:    patient_id,
+						RecordDate:   record_time,
+						GoodId:       item.GoodId,
+						GoodTypeId:   item.GoodTypeId,
+						Count:        item.Count,
+						Creater:      adminInfo.AdminUser.Id,
+						Status:       1,
+						Ctime:        time.Now().Unix(),
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 					//清空准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)
+					//查询默认仓库
+					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminInfo.Org.Id)
+					var sum_count int64
+					var sum_in_count int64
+					for _, it := range goodList {
+						sum_count += it.StockCount
+						sum_in_count += it.WarehousingCount
+					}
+					service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
 				}
 			}
 			//
@@ -4276,20 +4337,34 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 				}
 				for _, item := range list {
 					prepare := models.DialysisBeforePrepare{
-						UserOrgId:  adminInfo.Org.Id,
-						PatientId:  patient_id,
-						RecordDate: record_time,
-						GoodId:     item.GoodId,
-						GoodTypeId: item.GoodTypeId,
-						Count:      item.Count,
-						Creater:    adminInfo.AdminUser.Id,
-						Status:     1,
-						Ctime:      time.Now().Unix(),
+						UserOrgId:    adminInfo.Org.Id,
+						PatientId:    patient_id,
+						RecordDate:   record_time,
+						GoodId:       item.GoodId,
+						GoodTypeId:   item.GoodTypeId,
+						Count:        item.Count,
+						Creater:      adminInfo.AdminUser.Id,
+						Status:       1,
+						Ctime:        time.Now().Unix(),
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 
 					//清空准备表数据
 					err = service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)
+					//清空准备表数据
+					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+					service.CreateDialysisBeforePrepareOne(&prepare)
+					//查询默认仓库
+					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.GoodId, adminInfo.Org.Id)
+					var sum_count int64
+					var sum_in_count int64
+					for _, it := range goodList {
+						sum_count += it.StockCount
+						sum_in_count += it.WarehousingCount
+					}
+					service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
 
 				}
 			}
@@ -4331,7 +4406,7 @@ func (c *DialysisAPIController) EditConsumables() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
-
+	houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 	var beforePrepares []*models.DialysisBeforePrepareGoods
 
 	var newBeforePrepares []*models.NewDialysisBeforePrepareGoods
@@ -4375,17 +4450,19 @@ func (c *DialysisAPIController) EditConsumables() {
 					fmt.Println(commdity_code)
 
 					prepareGoods := &models.DialysisBeforePrepareGoods{
-						GoodTypeId: good_type_id,
-						GoodId:     good_id,
-						Count:      count,
+						GoodTypeId:   good_type_id,
+						GoodId:       good_id,
+						Count:        count,
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 
 					beforePrepares = append(beforePrepares, prepareGoods)
 
 					newPrepareGoods := &models.NewDialysisBeforePrepareGoods{
-						GoodTypeId: good_type_id,
-						GoodId:     good_id,
-						Count:      count,
+						GoodTypeId:   good_type_id,
+						GoodId:       good_id,
+						Count:        count,
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 
 					newBeforePrepares = append(newBeforePrepares, newPrepareGoods)
@@ -4404,6 +4481,15 @@ func (c *DialysisAPIController) EditConsumables() {
 					if item.Count < goodInfo.Count {
 						//出库
 						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+						var sum_count int64
+						var sum_in_count int64
+						for _, it := range goodList {
+							sum_count += it.StockCount
+							sum_in_count += it.WarehousingCount
+						}
+						service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
 						break
 					}
 
@@ -4449,6 +4535,15 @@ func (c *DialysisAPIController) EditConsumables() {
 							return
 						} else {
 							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
+							houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+							var sum_count int64
+							var sum_in_count int64
+							for _, it := range goodList {
+								sum_count += it.StockCount
+								sum_in_count += it.WarehousingCount
+							}
+							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
 							break
 						}
 					}
@@ -4459,20 +4554,31 @@ func (c *DialysisAPIController) EditConsumables() {
 
 				for _, it := range list {
 					prepare := models.DialysisBeforePrepare{
-						UserOrgId:  it.OrgId,
-						PatientId:  patient_id,
-						RecordDate: it.RecordTime,
-						GoodId:     it.GoodId,
-						GoodTypeId: it.GoodTypeId,
-						Count:      it.Count,
-						Ctime:      time.Now().Unix(),
-						Creater:    adminInfo.AdminUser.Id,
-						Status:     1,
+						UserOrgId:    it.OrgId,
+						PatientId:    patient_id,
+						RecordDate:   it.RecordTime,
+						GoodId:       it.GoodId,
+						GoodTypeId:   it.GoodTypeId,
+						Count:        it.Count,
+						Ctime:        time.Now().Unix(),
+						Creater:      adminInfo.AdminUser.Id,
+						Status:       1,
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 					//删除准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, it.GoodId, it.GoodTypeId)
 
 					service.CreateDialysisBeforePrepareOne(&prepare)
+					//查询默认仓库
+					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, it.GoodId, adminInfo.Org.Id)
+					var sum_count int64
+					var sum_in_count int64
+					for _, it := range goodList {
+						sum_count += it.StockCount
+						sum_in_count += it.WarehousingCount
+					}
+					service.UpdateGoodByGoodId(it.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
 
 					if err != nil {
 						goodObj, _ := service.GetGoodInformationByGoodId(it.GoodId)
@@ -4548,7 +4654,6 @@ func (c *DialysisAPIController) GetDialysisGoods() {
 				goodUser, _ := service.GetLastDialysisGoods(item.PatientId, adminUser.Org.Id, date.Unix())
 
 				lastGoodUserDetial, _ := service.GetLastDialysisBeforePrepare(item.PatientId, adminUser.Org.Id, date.Unix())
-				fmt.Println("GOOD333232323223322332232332232323322323", lastGoodUserDetial)
 				item.LastAutomaticReduceDetail = goodUser
 				item.LastDialysisBeforePrepare = lastGoodUserDetial
 				item.Project = project
@@ -4689,6 +4794,7 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
 	}
+	houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 
 	var beforePrepares []*models.DialysisBeforePrepareGoods
 
@@ -4730,18 +4836,20 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				}
 				project_id := int64(items["project_id"].(float64))
 				prepare := &models.DialysisBeforePrepareGoods{
-					GoodId:     good_id,
-					GoodTypeId: good_type_id,
-					Count:      count,
-					ProjectId:  project_id,
+					GoodId:       good_id,
+					GoodTypeId:   good_type_id,
+					Count:        count,
+					ProjectId:    project_id,
+					StorehouseId: houseConfig.StorehouseOutInfo,
 				}
 				beforePrepares = append(beforePrepares, prepare)
 
 				newPrepare := &models.NewDialysisBeforePrepareGoods{
-					GoodId:     good_id,
-					GoodTypeId: good_type_id,
-					Count:      count,
-					ProjectId:  project_id,
+					GoodId:       good_id,
+					GoodTypeId:   good_type_id,
+					Count:        count,
+					ProjectId:    project_id,
+					StorehouseId: houseConfig.StorehouseOutInfo,
 				}
 				newBeforePrepares = append(newBeforePrepares, newPrepare)
 			}
@@ -4750,7 +4858,8 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	fmt.Println("前端数据9999999999999", beforePrepares)
 	//查询是否有库存
 	for _, item := range beforePrepares {
-		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+		storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, storeConfig.StorehouseOutInfo)
 
 		if item.Count > warehouse.Count {
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
@@ -4777,21 +4886,34 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 
 	for _, item := range list {
 		prepare := models.DialysisBeforePrepare{
-			UserOrgId:  item.OrgId,
-			PatientId:  item.PatientId,
-			RecordDate: item.RecordTime,
-			GoodId:     item.GoodId,
-			GoodTypeId: item.GoodTypeId,
-			Count:      item.Count,
-			Creater:    adminInfo.AdminUser.Id,
-			Status:     1,
-			Ctime:      time.Now().Unix(),
-			ProjectId:  item.ProjectId,
+			UserOrgId:    item.OrgId,
+			PatientId:    item.PatientId,
+			RecordDate:   item.RecordTime,
+			GoodId:       item.GoodId,
+			GoodTypeId:   item.GoodTypeId,
+			Count:        item.Count,
+			Creater:      adminInfo.AdminUser.Id,
+			Status:       1,
+			Ctime:        time.Now().Unix(),
+			ProjectId:    item.ProjectId,
+			StorehouseId: houseConfig.StorehouseOutInfo,
 		}
 		//清空准备表的数据
 		err = service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 		//插入准备表数据
 		service.CreateDialysisBeforePrepareOne(&prepare)
+
+		//查询默认仓库
+		houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseInfo, item.ProjectId, adminInfo.Org.Id)
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range goodList {
+			sum_count += it.StockCount
+			sum_in_count += it.WarehousingCount
+		}
+		service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, adminInfo.Org.Id)
+
 	}
 
 	//更新自动出库的地方
@@ -5161,6 +5283,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 
 	delete_count = warehouseOutInfos.Count - count
 
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgID)
 	fmt.Println("delete_count2323232", delete_count)
 	// 在出库记录表里记录退库详情
 	warehouseOutInfo := &models.WarehouseOutInfo{
@@ -5176,6 +5299,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 		GoodId:                  good_yc.GoodId,
 		PatientId:               good_yc.PatientId,
 		ConsumableType:          2,
+		StorehouseId:            houseConfig.StorehouseOutInfo,
 	}
 	warehouseOutInfo.Count = count
 
@@ -5191,7 +5315,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 	//查找当天是否存在出库记录
 
 	_, errcod := service.GetWarehouseOutInfoIsExistOne(good_yc.GoodId, good_yc.PatientId, record_time)
-	fmt.Println("errcode2323223255556652324242424242424242424242424242242", errcod)
+
 	if errcod == gorm.ErrRecordNotFound {
 		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 		//插入详情明细表
@@ -5218,12 +5342,13 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			IsSys:                   1,
 			UpdateCreator:           creater,
 			PatientId:               patient_id,
+			StorehouseId:            houseConfig.StorehouseOutInfo,
 		}
 		exsit, errflow := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, good_yc.GoodId)
 		if errflow == gorm.ErrRecordNotFound {
 			//创建流水表
 			err := service.CreateStockFlowOne(stockFlow)
-			fmt.Println("h2h3h2323342i24i242i4u2i4242u42424", err)
+			fmt.Println("err", err)
 		} else if errflow == nil {
 			//插入详情明细表
 			stockFlow := models.VmStockFlow{
@@ -5251,6 +5376,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				IsSys:                   1,
 				UpdateCreator:           creater,
 				PatientId:               patient_id,
+				StorehouseId:            houseConfig.StorehouseOutInfo,
 			}
 
 			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
@@ -5287,6 +5413,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 			UpdateCreator:           creater,
 			PatientId:               patient_id,
 			ReturnCount:             delete_count,
+			StorehouseId:            houseConfig.StorehouseOutInfo,
 		}
 		exsit, errflows := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, good_yc.GoodId)
 		if errflows == gorm.ErrRecordNotFound {
@@ -5319,6 +5446,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 				UpdateCreator:           creater,
 				PatientId:               patient_id,
 				ReturnCount:             delete_count,
+				StorehouseId:            houseConfig.StorehouseOutInfo,
 			}
 			//service.UpdatedStockFlow(stockFlow)
 			service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, good_yc.GoodId)
@@ -5339,6 +5467,7 @@ func ConsumablesDeliveryDeleteFour(orgID int64, record_time int64, good_yc *mode
 		GoodId:                  good_yc.GoodId,
 		GoodTypeId:              good_yc.GoodTypeId,
 		Count:                   count,
+		StorehouseId:            houseConfig.StorehouseOutInfo,
 	}
 	//查询当天耗材是否已经存在数据
 	_, errcode := service.GetAutoMaticReduceDetail(orgID, patient_id, record_time, good_yc.GoodId, good_yc.GoodTypeId)
@@ -5412,6 +5541,7 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 
 	if len(goods) > 0 {
 		out, err := service.FindStockOutByIsSys(orgID, 1, record_time)
+		houseConfig, _ := service.GetAllStoreHouseConfig(orgID)
 		if err == gorm.ErrRecordNotFound {
 			//没有记录，则创建出库单
 			timeStr := time.Now().Format("2006-01-02")
@@ -5434,6 +5564,7 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 				Manufacturer:            0,
 				Type:                    1,
 				IsSys:                   1,
+				StorehouseId:            houseConfig.StorehouseOutInfo,
 			}
 			err := service.AddSigleWarehouseOut(&warehouseOut)
 			if err != nil {
@@ -5452,11 +5583,12 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 				}
 			}
 			prepare := models.DialysisBeforePrepare{
-				GoodTypeId: item.GoodTypeId,
-				GoodId:     item.GoodId,
-				Count:      item.Count,
+				GoodTypeId:   item.GoodTypeId,
+				GoodId:       item.GoodId,
+				Count:        item.Count,
+				StorehouseId: houseConfig.StorehouseOutInfo,
 			}
-			fmt.Println("到这里了吗34344343434334343434", newCount)
+
 			service.ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
 		}
 
@@ -5505,6 +5637,7 @@ func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *mod
 			SysRecordTime:           record_time,
 			GoodTypeId:              good_yc.GoodTypeId,
 			GoodId:                  good_yc.GoodId,
+			StorehouseId:            warehouseOut.StorehouseId,
 		}
 		warehouseOutInfo.Count = delete_count
 		stockInInfo, _ := service.FindLastStockInInfoRecord(good_yc.GoodId, orgID)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -701,8 +701,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					var prescribing_number_total int64
 					for _, item := range advices {
 						if item.Way == 1 {
+							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 							//查询该药品的剩余库存
-							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 
 							//查询改药品信息
 							medical, _ := service.GetBaseDrugMedical(item.DrugId)
@@ -743,6 +744,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if prescribing_number_total <= total {
 								if medical.IsUse == 2 {
 									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									//查询默认仓库
+									houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+									//查询默认仓库剩余多少库存
+									list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+									var sum_count int64
+									var sum_in_count int64
+									for _, it := range list {
+										baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+										if it.MaxUnit == baseDrug.MaxUnit {
+											it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+											it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+										}
+										sum_count += it.StockMaxNumber + it.StockMinNumber
+										sum_in_count += it.WarehousingCount
+									}
+									service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
 								}
 							}
 
@@ -772,8 +789,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					for _, item := range advices {
 
 						if item.Way == 1 {
+							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 							//查询该药品的剩余库存
-							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+							list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 
 							//查询改药品信息
 							medical, _ := service.GetBaseDrugMedical(item.DrugId)
@@ -818,6 +836,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if prescribing_number_total <= total {
 								if medical.IsUse == 2 {
 									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
+									//查询默认仓库
+									houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+									//查询默认仓库剩余多少库存
+									list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+									var sum_count int64
+									var sum_in_count int64
+									for _, it := range list {
+										baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+										if it.MaxUnit == baseDrug.MaxUnit {
+											it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+											it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+										}
+										sum_count += it.StockMaxNumber + it.StockMinNumber
+										sum_in_count += it.WarehousingCount
+									}
+									service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "1",
 										"advice": advice,
@@ -1059,7 +1093,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					var total int64
 					var prescribing_number_total int64
 					//查询该药品是否有库存
-					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+					houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+					list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
 
 					//判断单位是否相等
 					if medical.MaxUnit == advice.PrescribingNumberUnit {
@@ -1099,6 +1134,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if prescribing_number_total <= total {
 						if medical.IsUse == 2 {
 							service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+							//查询默认仓库
+							houseConfig, _ := service.GetAllStoreHouseConfig(medical.OrgId)
+							//查询默认仓库剩余多少库存
+							list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, medical.OrgId, medical.ID)
+							var sum_count int64
+							var sum_in_count int64
+							for _, it := range list {
+								baseDrug, _ := service.GetBaseDrugMedical(medical.ID)
+								if it.MaxUnit == baseDrug.MaxUnit {
+									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+								}
+								sum_count += it.StockMaxNumber + it.StockMinNumber
+								sum_in_count += it.WarehousingCount
+							}
+							service.UpdateMedicalSumCount(medical.ID, sum_count, sum_in_count, medical.OrgId)
 						}
 					}
 				}

controllers/patient_api_controller.go

@@ -348,6 +348,7 @@ func (c *PatientApiController) CreatePatient() {
 		MemberTreatement:             0,
 		EquitmentId:                  "",
 		UserSysBeforeCount:           patient.UserSysBeforeCount,
+		TrobleShoot:                  patient.TrobleShoot,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -562,6 +563,7 @@ func (c *PatientApiController) EditPatient() {
 		UpdatedTime:               time.Now().Unix(),
 		BloodPatients:             1,
 		Lapseto:                   patient.Lapseto,
+		TrobleShoot:               patient.TrobleShoot,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -1726,9 +1728,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			var prescribing_number_total int64
 			advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
-
+				houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 				//查询该药品是否有库存
-				list, _ := service.GetDrugTotalCount(item.DrugId, item.UserOrgId)
+				list, _ := service.GetDrugTotalCountTwenty(item.DrugId, item.UserOrgId, houseConfig.DrugStorehouseOut)
 
 				//查询改药品信息
 				medical, _ := service.GetBaseDrugMedical(item.DrugId)
@@ -1747,9 +1749,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					prescribing_number_total = count
 				}
 
-				fmt.Println("数量一", prescribing_number_total)
-				fmt.Println("数量二", total)
-
 				if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
 					c.ServeSuccessJSON(map[string]interface{}{
 						"msg":    "3",
@@ -1767,6 +1766,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if prescribing_number_total <= total {
 					if medical.IsUse == 2 {
 						service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
+						//查询默认仓库
+						houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+						//查询默认仓库剩余多少库存
+						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+						var sum_count int64
+						var sum_in_count int64
+						for _, it := range list {
+							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+							if it.MaxUnit == baseDrug.MaxUnit {
+								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+							}
+							sum_count += it.StockMaxNumber + it.StockMinNumber
+							sum_in_count += it.WarehousingCount
+						}
+						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
 						break
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "1",
@@ -1990,8 +2005,12 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 				var total int64
 				var prescribing_number_total int64
-				//查询该药品是否有库存
-				list, _ := service.GetDrugTotalCount(advice.DrugId, advice.UserOrgId)
+
+				//查询默认出库仓库
+				houseConfig, _ := service.GetAllStoreHouseConfig(advice.UserOrgId)
+
+				//查询该药品在默认仓库是否有库存
+				list, _ := service.GetDrugTotalCountTwenty(advice.DrugId, advice.UserOrgId, houseConfig.DrugStorehouseOut)
 
 				//判断单位是否相等
 				if medical.MaxUnit == advice.PrescribingNumberUnit {
@@ -2028,6 +2047,23 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 				if prescribing_number_total <= total {
 					if medical.IsUse == 2 {
 						service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
+
+						//查询默认仓库
+						houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+						//查询默认仓库剩余多少库存
+						list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+						var sum_count int64
+						var sum_in_count int64
+						for _, it := range list {
+							baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+							if it.MaxUnit == baseDrug.MaxUnit {
+								it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+								it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+							}
+							sum_count += it.StockMaxNumber + it.StockMinNumber
+							sum_in_count += it.WarehousingCount
+						}
+						service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
 						break
 						c.ServeSuccessJSON(map[string]interface{}{
 							"msg":    "1",
@@ -4076,6 +4112,11 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		patient.ContactName = contact_name
 	}
 
+	if patientBody["troble_shoot"] != nil && reflect.TypeOf(patientBody["troble_shoot"]).String() == "float64" {
+		troble_shoot := int64(patientBody["troble_shoot"].(float64))
+		patient.TrobleShoot = troble_shoot
+	}
+
 	return
 
 }

controllers/self_drug_api_congtroller.go

@@ -950,8 +950,9 @@ func (this *SelfDrugApiController) GetSelfStockQuery() {
 func (this *SelfDrugApiController) PostSearchDrugWarehouseList() {
 
 	keyword := this.GetString("keyword")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, err := service.PostSearchDrugWarehouseList(keyword, orgId)
+	list, err := service.PostSearchDrugWarehouseList(keyword, orgId, storehouse_id)
 	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	dealerList, err := service.GetAllDealerList(orgId)
 	if err != nil {
@@ -1433,6 +1434,7 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -1456,10 +1458,12 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 
-	list, total, err := service.GetDrugDamageList(startTime, endTime, orgId, keyword, limit, page)
+	list, total, err := service.GetDrugDamageList(startTime, endTime, orgId, keyword, limit, page, storehouse_id)
 
 	damagelist, _ := service.GetDrugDamageByOrgId(orgId)
 	doctorList, err := service.GetAllDoctorThree(orgId)
+
+	houseList, _ := service.GetAllStoreHouseList(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
@@ -1470,6 +1474,7 @@ func (this *SelfDrugApiController) GetDrugDamageList() {
 		"list":       list,
 		"damagelist": damagelist,
 		"doctorList": doctorList,
+		"houseList":  houseList,
 	})
 }
 
@@ -1735,7 +1740,8 @@ func (this *SelfDrugApiController) GetDrugDamagePrint() {
 func (this *SelfDrugApiController) GetWarehoseInfoById() {
 
 	id, _ := this.GetInt64("id")
-	list, _ := service.GetWarehoseInfoById(id)
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	list, _ := service.GetWarehoseInfoById(id, storehouse_id)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
@@ -1975,17 +1981,21 @@ func (this *SelfDrugApiController) GetDrugInventoryList() {
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
 	list, total, err := service.GetDrugInventoryList(keyword, page, limit, orgId, startTime, endTime)
-	fmt.Println("list23232323223", list)
+
 	doctorList, _ := service.GetAllDoctorThree(orgId)
+	houseList, _ := service.GetAllStoreHouseList(orgId)
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":      total,
-		"list":       list,
-		"doctorList": doctorList,
+		"total":       total,
+		"list":        list,
+		"doctorList":  doctorList,
+		"houseList":   houseList,
+		"houseConfig": houseConfig,
 	})
 }
 
@@ -2342,9 +2352,11 @@ func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
 	keyword := this.GetString("keyword")
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
+	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	list, total, err := service.GetDrugInventoryDetailList(keyword, page, limit, orgId)
-	fmt.Println("list23232323223", list)
+	list, total, err := service.GetDrugInventoryDetailList(keyword, page, limit, orgId, storehouse_id)
+
+	houseList, _ := service.GetAllStoreHouseList(orgId)
 	doctorList, _ := service.GetAllDoctorThree(orgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
@@ -2355,6 +2367,7 @@ func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
 		"total":      total,
 		"list":       list,
 		"doctorList": doctorList,
+		"houseList":  houseList,
 	})
 }
 
@@ -2472,6 +2485,8 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 			expiry_date := int64(items["expiry_date"].(float64))
 
 			manufacturer := int64(items["manufacturer"].(float64))
+
+			storehouse_id := int64(items["storehouse_id"].(float64))
 			timeLayout := "2006-01-02"
 			loc, _ := time.LoadLocation("Local")
 			timeNow := time.Now().Format("2006-01-02")
@@ -2480,29 +2495,68 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 			var consumable_count int64
 			var ord_total int64
 			var new_total int64
+			var total int64
 			ord_total = stock_max_number*min_number + stock_min_number
 			new_total = last_stock_max_number*min_number + last_stock_min_number
+			medical, _ := service.GetBaseDrugMedical(drug_id)
+
+			//改变库存
+			info := models.DrugWarehouseInfo{
+				DrugId:           drug_id,
+				StockMaxNumber:   last_stock_max_number,
+				StockMinNumber:   last_stock_min_number,
+				WarehousingCount: last_stock_max_number,
+				MaxUnit:          max_unit,
+				MinUnit:          min_unit,
+			}
+			drugInfo, _ := service.GetCurrentWarehosueInfoOne(id)
 
+			if drugInfo.MaxUnit == medical.MaxUnit {
+				total = drugInfo.WarehousingCount * medical.MinNumber
+			}
+			if drugInfo.MaxUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+				total = drugInfo.WarehousingCount
+			}
+			//如果库存数据大于盘点数据,则减去数量
 			if ord_total > new_total {
 				consumable_type = 11
 				consumable_count = ord_total - new_total
+
+				err = service.ModifyDrugWarehouseInfo(&info, id)
+
 			}
-			if ord_total < new_total {
+			//如果库存数据小于盘点数据,则增加数量
+			if ord_total < new_total && new_total <= total {
 				consumable_type = 10
 				consumable_count = new_total - ord_total
+				err = service.ModifyDrugWarehouseInfo(&info, id)
+
 			}
-			fmt.Println("ord_total", ord_total)
-			fmt.Println("new_total23323232323223", new_total)
-			fmt.Println("consumable_count", consumable_count)
 
-			//改变库存
-			info := models.DrugWarehouseInfo{
-				DrugId:         drug_id,
-				StockMaxNumber: last_stock_max_number,
-				StockMinNumber: last_stock_min_number,
+			if ord_total < new_total && new_total > total {
+				consumable_type = 10
+				consumable_count = new_total - ord_total
+				err = service.ModifyDrugWarehouseInfoSix(&info, id)
+
+			}
+
+			//查询默认仓库
+			houseConfig, _ := service.GetAllStoreHouseConfig(drugInfo.OrgId)
+			//查询默认仓库剩余多少库存
+			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, drugInfo.OrgId, drugInfo.DrugId)
+			var sum_count int64
+			var sum_in_count int64
+			for _, it := range list {
+				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+				if it.MaxUnit == baseDrug.MaxUnit {
+					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+				}
+				sum_count += it.StockMaxNumber + it.StockMinNumber
+				sum_in_count += it.WarehousingCount
 			}
+			service.UpdateMedicalSumCount(drugInfo.DrugId, sum_count, sum_in_count, drugInfo.OrgId)
 
-			err = service.ModifyDrugWarehouseInfo(&info, id)
 			inventory := models.XtDrugInventory{
 				DrugName:           drug_name,
 				SpecificationName:  specification_name,
@@ -2542,6 +2596,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				LastStockMinNumber: last_stock_min_number,
 				InventoryType:      consumable_type,
 				Type:               type_id,
+				StorehouseId:       storehouse_id,
 			}
 
 			err = service.CreateDrugInventory(inventory)
@@ -2578,6 +2633,7 @@ func (this *SelfDrugApiController) SaveInventoryList() {
 				ProductDate:             0,
 				MaxUnit:                 min_unit,
 				MinUnit:                 min_unit,
+				StorehouseId:            storehouse_id,
 			}
 			if ord_total != new_total {
 				service.CreateDrugFlowOne(flow)

controllers/stock_good_api_controller.go

@@ -174,9 +174,17 @@ func (c *StockGoodApiController) GetGoodType() {
 func (c *StockGoodApiController) GetAllGoodType() {
 	adminUserInfo := c.GetAdminUserInfo()
 	goodTypes, err := service.FindAllGoodType(adminUserInfo.CurrentOrgId)
+	houseList, _ := service.GetAllStoreHouseListTwo(adminUserInfo.CurrentOrgId)
+	storehouselist, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
+	goodInfo, _ := service.FindAllGoodInfo(adminUserInfo.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"goodType": goodTypes,
+			"goodType":         goodTypes,
+			"houseList":        houseList,
+			"goodInfo":         goodInfo,
+			"manufacturerList": manufacturerList,
+			"storehouseList":   storehouselist,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/supply_order_api_contorller.go

@@ -2082,7 +2082,7 @@ func (this *SupplyOrderApiController) GetAllOrderCountList() {
 	purcaseOrder, _ := service.GetAllPurcaseOrderById(id, orgId)
 	//获取购货单的数据
 	goodOrder, err := service.GetAllGoodOrderByIdSix(id, orgId)
-	fmt.Println("2323232332232323232332", goodOrder)
+
 	drugList, err := service.GetSupplyDrugList(orgId)
 
 	if err == nil {
@@ -2195,6 +2195,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 	//获取购货单的数据
 	goodOrder, _ := service.GetAllGoodOrderByIdTwo(id, orgId)
 
+	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 	//查询该购货单是否审核成功
 	detail, _ := service.GetGoodOrderDetail(id, orgId)
 	var warehousingInfo []*models.WarehousingInfo
@@ -2227,6 +2228,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						WarehousingTime:   record_date,
 						Type:              1,
 						SupplyWarehouseId: id,
+						StorehouseId:      houseConfig.DrugStorehouseInfo,
 					}
 					//查询今日是否存在入库单号
 					//_, errcode := service.GetSingleDrugWarehouseOrder(record_date, orgId)
@@ -2260,6 +2262,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						RetailPrice:               item.MinPrice,
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
+						StorehouseId:              houseConfig.DrugStorehouseInfo,
 					}
 					if medical.MaxUnit == medical.MinUnit {
 						warehouseInfoDetailOne.StockMaxNumber = item.Count
@@ -2296,6 +2299,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						IsSys:                     0,
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
+						StorehouseId:              houseConfig.DrugStorehouseInfo,
 					}
 
 					if medical.MaxUnit == medical.MinUnit {
@@ -2328,6 +2332,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						WarehousingTime:   record_date,
 						Type:              1,
 						SupplyWarehouseId: id,
+						StorehouseId:      houseConfig.StorehouseInfo,
 					}
 					//查询是否存在入库单
 					//_, errcose := service.GetSindleWarehouse(record_date, orgId)
@@ -2360,6 +2365,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						PackingPrice:              item.MinPrice,
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
+						StorehouseId:              houseConfig.StorehouseInfo,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 				}
@@ -2369,7 +2375,18 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 
 	for _, item := range warehousingInfo {
 		service.CreatedWarehouseingDetail(item)
-		service.ModifyGoodAddInformation(item.GoodId, item.StockCount, item.OrgId)
+		//查询该机构默认仓库
+		storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+		//查询剩余库存
+		goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
+		var sum_count int64
+		var sum_in_count int64
+		for _, item := range goodList {
+			sum_count += item.StockCount
+			sum_in_count += item.WarehousingCount
+		}
+		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+
 		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
 		flow := models.VmStockFlow{
 			WarehousingOrder:          item.WarehousingOrder,
@@ -2393,22 +2410,33 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 			WarehousingDetailId:       warehousinginfo.ID,
 			SupplyWarehouseId:         id,
 			SupplyWarehouseDetailInfo: item.ID,
+			StorehouseId:              houseConfig.StorehouseInfo,
 		}
 		service.CreateStockFlowOne(flow)
 	}
 	//创建入库单
 	errs := service.CreateDrugWarehousingInfoSix(warehouseInfoDetail)
+
 	//改变入库状态
 	for _, items := range warehouseInfoDetail {
-		medical, _ := service.GetBaseDrugMedical(items.DrugId)
-		if items.MaxUnit == medical.MaxUnit {
-			var sum_count int64
-			sum_count = items.WarehousingCount * medical.MinNumber
-			service.ModifyDrugAddInformation(items.DrugId, sum_count, items.OrgId)
-		}
-		if items.MaxUnit == medical.MinUnit {
-			service.ModifyDrugAddInformation(items.DrugId, items.WarehousingCount, items.OrgId)
+
+		//查询默认仓库
+		houseConfig, _ := service.GetAllStoreHouseConfig(items.OrgId)
+		//查询默认仓库剩余多少库存
+		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, items.OrgId, items.DrugId)
+		var sum_count int64
+		var sum_in_count int64
+		for _, it := range list {
+			baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+			if it.MaxUnit == baseDrug.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+			}
+			sum_count += it.StockMaxNumber + it.StockMinNumber
+			sum_in_count += it.WarehousingCount
 		}
+		service.UpdateMedicalSumCount(items.DrugId, sum_count, sum_in_count, items.OrgId)
+
 	}
 	fmt.Println(errs)
 	for _, items := range drugFlow {
@@ -3177,16 +3205,28 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 		}
 
 		// 查询入库单
-		drugInfo, _ := service.GetDrugSupplyWarehouseId(id, orgId)
-		if drugInfo.StockMaxNumber > 0 {
-			medical, _ := service.GetBaseDrugMedical(drugInfo.DrugId)
-			var stock_count int64
-			stock_count = drugInfo.StockMaxNumber * medical.MinNumber
-			service.ModifyDrugReduceInformation(drugInfo.DrugId, stock_count, drugInfo.OrgId)
-		}
-		if drugInfo.StockMinNumber > 0 {
-			service.ModifyDrugReduceInformation(drugInfo.DrugId, drugInfo.StockMinNumber, drugInfo.OrgId)
+		drugInfo, _ := service.GetDrugSupplyWarehouseIdSeven(id, orgId)
+		for _, item := range drugInfo {
+
+			//查询默认仓库
+			houseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+			//查询默认仓库剩余多少库存
+			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
+			var sum_count int64
+			var sum_in_count int64
+			for _, it := range list {
+				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+				if it.MaxUnit == baseDrug.MaxUnit {
+					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+
+				}
+				sum_count += it.StockMaxNumber + it.StockMinNumber
+				sum_in_count += it.WarehousingCount
+			}
+			service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
 		}
+
 		//删除药品入库单
 		service.UpdateDrugSupplyWarehousingInfo(id, orgId)
 
@@ -3194,9 +3234,22 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 		service.UpdateDrugSupplyFlow(id, orgId)
 
 		//查寻入库单
-		info, _ := service.GetSupplySupplyWarehouseId(id, orgId)
-		//扣减库存
-		service.ModifyGoodReduceInformation(info.GoodId, info.StockCount, info.OrgId)
+		info, _ := service.GetSupplySupplyWarehouseIdSeven(id, orgId)
+		for _, item := range info {
+			//扣减库存
+			//查询该机构默认仓库
+			storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+			//查询剩余库存
+			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
+			var sum_count int64
+			var sum_in_count int64
+			for _, item := range goodList {
+				sum_count += item.StockCount
+				sum_in_count += item.WarehousingCount
+			}
+			service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+		}
+
 		//删除耗材入库单
 		service.UpdateGoodSupplyWarehousingInfo(id, orgId)
 
@@ -3317,7 +3370,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	record_date := recordDate.Unix()
 	checker := this.GetAdminUserInfo().AdminUser.Id
-
+	houseConfig, _ := service.GetAllStoreHouseConfig(this.GetAdminUserInfo().CurrentOrgId)
 	//获取退库单详情
 	list, _ := service.GetSupplyCancelOrderDetail(id, orgId)
 	for _, item := range list {
@@ -3328,7 +3381,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 		if item.IsSource == 1 {
 
 			//获取药品库存
-			info, _ := service.GetDrugTotalCountTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type)
+			info, _ := service.GetDrugTotalCountTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type, houseConfig.DrugStorehouseOut)
 
 			for _, it := range info {
 
@@ -3351,7 +3404,6 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				prescribing_number_total = item.SupplyCount
 			}
 
-			fmt.Println("hhhhhadf dafsdfsdfddddfdf", prescribing_number_total)
 			//判断单位
 			if total_count == 0 {
 				goodObj, _ := service.GetDrugByGoodId(item.ProjectId)
@@ -3409,6 +3461,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				Type:                    1,
 				SupplyCancelOutId:       id,
 				SupplyWarehouseId:       warehouse_out_id,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
 			}
 			// 查询今日是否存在出库单
 			_, errcodes := service.GetDrugWarehouseOutById(orgId, record_date)
@@ -3444,6 +3497,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyWarehouseId:       warehouse_out_id,
 				SysRecordTime:           record_date,
 				IsSource:                item.Type,
+				StorehouseId:            houseConfig.DrugStorehouseOut,
 			}
 
 			drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
@@ -3462,7 +3516,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 		//耗材
 		if item.IsSource == 2 {
 			// 查询该耗材是否有库存
-			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type)
+			warehouseOne, _ := service.FindWarehousingInfoTwenTy(item.ProjectId, item.SupplyWarehouseDetailInfo, item.Type, houseConfig.StorehouseOutInfo)
 
 			// 如果出库数量大于该批次剩余库存数量
 			if item.SupplyCount > warehouseOne.StockCount {
@@ -3505,6 +3559,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				SupplyCancelOutId:       id,
 				SupplyWarehouseId:       warehouse_out_id,
 				IsSys:                   0,
+				StorehouseId:            houseConfig.StorehouseOutInfo,
 			}
 			//查询是否生成出库单
 			_, errcodes := service.FindStockOutByIsSys(orgId, 0, record_date)
@@ -3512,7 +3567,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				service.AddSigleWarehouseOut(&warehouseOut)
 			}
 			outWarehouse, _ := service.GetlastWarehouseOutById(orgId, record_date)
-			fmt.Println("232332322332232323", outWarehouse)
+
 			goodObj, _ := service.GetGoodInformationByGoodId(item.ProjectId)
 			info := &models.WarehouseOutInfo{
 				WarehouseOutOrderNumber: outWarehouse.WarehouseOutOrderNumber,
@@ -3537,6 +3592,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 				OrgId:                   orgId,
 				SupplyWarehouseId:       warehouse_out_id,
 				IsSource:                item.Type,
+				StorehouseId:            houseConfig.StorehouseOutInfo,
 			}
 			//出库逻辑
 			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.SupplyCount, creater, warehouse_out_id, id)
@@ -3554,7 +3610,7 @@ func (this *SupplyOrderApiController) CheckReturnOrder() {
 		CheckTime: record_date,
 	}
 	err := service.CheckReturnOrder(id, orgId, cancel)
-	fmt.Println("3232233232322332232323232323322332232323232323")
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"msg":        "1",
@@ -3628,7 +3684,6 @@ func (this *SupplyOrderApiController) DeleteReturnOrderById() {
 func (this *SupplyOrderApiController) ModefyReturnOrder() {
 	id, _ := this.GetInt64("id")
 	err := service.ModefyReturnOrder(id)
-
 	//获取退库单据日期
 	cancel, _ := service.GetReturnOrderById(id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
@@ -3646,7 +3701,11 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 					drugInfo := models.DrugWarehouseInfo{
 						StockMaxNumber: item.SupplyCount,
 					}
+
 					service.UpdateDrugWasehousring(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
+					var sum_count int64
+					sum_count = item.SupplyCount * base.MinNumber
+					service.ModifyDrugAddInformation(item.ProjectId, sum_count, orgId)
 				}
 
 				if item.SupplyType == base.MinUnit && base.MaxUnit != base.MinUnit {
@@ -3654,6 +3713,7 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 						StockMinNumber: item.SupplyCount,
 					}
 					service.UpdateDrugWasehousringOne(item.ProjectId, item.SupplyWarehouseDetailInfo, drugInfo)
+					service.ModifyDrugAddInformation(item.ProjectId, item.SupplyCount, orgId)
 				}
 
 				//删除流水
@@ -3668,7 +3728,7 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 			}
 			//耗材
 			if item.IsSource == 2 {
-				fmt.Println("item2332322323232332", item.SupplyCount)
+
 				//退库
 				info := models.WarehousingInfo{
 					StockCount: item.SupplyCount,
@@ -3676,6 +3736,7 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 
 				//更改库存
 				err := service.UpdateWarehousingInfoById(item.ProjectId, item.SupplyWarehouseDetailInfo, info)
+				service.ModifyGoodAddInformation(item.ProjectId, item.SupplyCount, item.UserOrgId)
 				fmt.Println(err)
 				//删除出库记录
 				service.DeleteGoodWarehouseOut(item.ProjectId, item.WarehouseCancelId, orgId)

models/dialysis.go

@@ -1048,6 +1048,7 @@ type DialysisBeforePrepare struct {
 	NewCount     int64                    `gorm:"column:new_count" json:"new_count" form:"new_count"`
 	Children     []*DialysisBeforePrepare `gorm:"column:children" json:"children" form:"children"`
 	ProjectId    int64                    `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	StorehouseId int64                    `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (DialysisBeforePrepare) TableName() string {
@@ -1061,6 +1062,7 @@ type DialysisBeforePrepareGoods struct {
 	TypeName          string `gorm:"column:type_name" json:"type_name" form:"type_name"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	ProjectId         int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type NewDialysisBeforePrepareGoods struct {
@@ -1071,6 +1073,7 @@ type NewDialysisBeforePrepareGoods struct {
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
 	ProjectId         int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type QueueCallConfig struct {

models/dialysis_parameter_models.go

@@ -96,6 +96,7 @@ type BloodAutomaticReduceDetail struct {
 	GoodTypeId              int64  `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
 	Count                   int64  `gorm:"column:count" json:"count" form:"count"`
 	ProjectId               int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	StorehouseId            int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (BloodAutomaticReduceDetail) TableName() string {

models/drug.go

@@ -72,6 +72,9 @@ type BaseDrugLib struct {
 	PrescribingNumberUnit string                 `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	DrugWarehouseInfo     []*XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
 	IsUse                 int64                  `gorm:"column:is_user" json:"is_user" form:"is_user"`
+	BatchRetaiPrice       float64                `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumCount              int64                  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount            int64                  `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 }
 
 func (BaseDrugLib) TableName() string {
@@ -84,6 +87,7 @@ type BaseDrugLibSeven struct {
 	MaxUnit   string `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	MinNumber int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit   string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	SumCount  int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

models/drug_stock.go

@@ -15,6 +15,9 @@ type DrugWarehouse struct {
 	Manufacturer      int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	Type              int64  `gorm:"column:type" json:"type" form:"type"`
 	SupplyWarehouseId int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId int64  `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	IsSys             int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 }
 
 func (DrugWarehouse) TableName() string {
@@ -81,6 +84,8 @@ type DrugWarehouseInfo struct {
 	WarehousingInfoId         int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 }
 
 func (DrugWarehouseInfo) TableName() string {
@@ -116,6 +121,8 @@ type DrugWarehouseOut struct {
 	Dealers                 *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	SupplyCancelOutId       int64         `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64         `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId            int64         `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId       int64         `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 }
 
 func (DrugWarehouseOut) TableName() string {
@@ -155,6 +162,9 @@ type DrugWarehouseOutInfo struct {
 	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
@@ -226,6 +236,7 @@ type DrugCancelStock struct {
 	Manufacturers       *Manufacturer          `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
 	Dealers             *Dealer                `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	DrugCancelStockInfo []*DrugCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"drugCancelStockInfo"`
+	StorehouseId        int64                  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (DrugCancelStock) TableName() string {
@@ -258,6 +269,7 @@ type DrugCancelStockInfo struct {
 	MaxUnit          string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 	BaseDrugLib      BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 	BatchNumberId    int64       `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
+	StorehouseId     int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (DrugCancelStockInfo) TableName() string {
@@ -279,6 +291,7 @@ type DrugAutomaticReduceDetail struct {
 	CountUnit               string `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 	WarehouseInfoId         int64  `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 	AdviceId                int64  `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	StorehouseId            int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (DrugAutomaticReduceDetail) TableName() string {
@@ -306,6 +319,7 @@ type VmDrugWarehouseInfo struct {
 	MinNumber                 int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	SupplyWarehouseId         int64  `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64  `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type StDrugWarehouseOutInfo struct {
@@ -393,6 +407,9 @@ type DrugFlow struct {
 	SupplyWarehouseId         int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyCancelOutId         int64                `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseDetailInfo int64                `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64                `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64                `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (DrugFlow) TableName() string {

models/good_models.go

@@ -88,6 +88,8 @@ type GoodInfo struct {
 	IsWarehouse                 int64                `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
 	SumCount                    int64                `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	BatchRetaiPrice             float64              `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumInCount                  int64                `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	WarehousingInfo             []*WarehousingInfo   `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"warehouse_info"`
 }
 
 func (GoodInfo) TableName() string {

models/patient_models.go

@@ -186,6 +186,7 @@ type Patients struct {
 	SchRemark                string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	OutReason                string  `gorm:"column:out_reason" json:"out_reason" form:"out_reason"`
 	DeathTime                int64   `gorm:"column:death_time" json:"death_time" form:"death_time"`
+	TrobleShoot              int64   `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 	ContagionIds             []int64 `gorm:"-"`
 	DryWeight                float64 `gorm:"-"`
 }
@@ -741,6 +742,7 @@ type XtPatientsNew struct {
 	SchRemark                    string  `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	OutReason                    string  `gorm:"column:out_reason" json:"out_reason" form:"out_reason"`
 	DeathTime                    int64   `gorm:"column:death_time" json:"death_time" form:"death_time"`
+	TrobleShoot                  int64   `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
 }
 
 func (XtPatientsNew) TableName() string {

models/secondary_models.go

@@ -1,5 +1,203 @@
 package models
 
-func main() {
+//二级仓库
+type Storehouse struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	StorehouseCode    string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`             //仓库编号
+	StorehouseName    string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`             //仓库名称
+	StorehouseAddress string `gorm:"column:storehouse_address" json:"storehouse_address" form:"storehouse_address"`    //仓库地址
+	StorehouseStatus  int64  `gorm:"column:storehouse_status" json:"storehouse_status" form:"storehouse_status"`       //仓库状态
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`                                        //数据状态
+	StorehouseAdminId int64  `gorm:"column:storehouse_admin_id" json:"storehouse_admin_id" form:"storehouse_admin_id"` //仓库管理员id
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (Storehouse) TableName() string {
+	return "xt_storehouse"
+}
+
+//仓库配置
+type StorehouseConfig 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"`                         //机构id
+	StorehouseInfo     int64 `gorm:"column:storehouse_info" json:"storehouse_info" form:"storehouse_info"`             //耗材 自动入库 的仓库id
+	StorehouseOutInfo  int64 `gorm:"column:storehouse_out_info" json:"storehouse_out_info" form:"storehouse_out_info"` //耗材 自动出库 的仓库id
+	DrugStorehouseInfo int64 `gorm:"drug_storehouse_info" json:"drug_storehouse_info" form:"drug_storehouse_info"`     //药品 自动入库 的仓库id
+	DrugStorehouseOut  int64 `gorm:"drug_storehouse_out" json:"drug_storehouse_out" form:"drug_storehouse_out"`        //药品 自动出库 的仓库id
+	Status             int64 `gorm:"status" json:"status" form:"status"`
+	Ctime              int64 `gorm:"ctime" json:"ctime" form:"ctime"`
+	Mtime              int64 `gorm:"mtime" json:"mtime" form:"mtime"`
+}
+
+func (StorehouseConfig) TableName() string {
+	return "xt_storehouse_config"
+}
+
+type App_Role_byli struct {
+	Id          int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	OrgId       int64  `gorm:"column:org_id" json:"org_id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	UserName    string `gorm:"column:user_name" json:"user_name"` // 用户名称
+}
+
+func (App_Role_byli) TableName() string {
+	return "sgj_users.sgj_user_admin_role"
+}
+
+type UserOrg struct {
+	Id      int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	Creator int64 `gorm:"column:creator" json:"creator"`
+}
+
+func (UserOrg) TableName() string {
+	return "sgj_users.sgj_user_org"
+}
+
+//分页
+type Storehouselist struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	StorehouseCode      string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`                 //仓库编号
+	StorehouseName      string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`                 //仓库名称
+	StorehouseAddress   string `gorm:"column:storehouse_address" json:"storehouse_address" form:"storehouse_address"`        //仓库地址
+	StorehouseStatus    int64  `gorm:"column:storehouse_status" json:"storehouse_status" form:"storehouse_status"`           //仓库状态
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`                                            //数据状态
+	StorehouseAdminId   int64  `gorm:"column:storehouse_admin_id" json:"storehouse_admin_id" form:"storehouse_admin_id"`     //仓库管理员id
+	StorehouseAdminName string `gorm:"column:storehouse_admin_name" json:"storehouse_admin_name" form:"storehouse_admin_id"` //仓库管理员名字
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+type RolePurviews struct {
+	Id         int64 `gorm:"PRIMARY_KEY;AUTO_INCREMENT"`
+	RoleId     int64
+	OrgId      int64
+	AppId      int64
+	PurviewIds string `gorm:"column:purview_ids"`
+	Status     int8   // 状态 0.无效 1.有效 2.禁用
+	CreateTime int64  `gorm:"column:ctime"` // 创建时间
+	ModifyTime int64  `gorm:"column:mtime"` // 修改时间
+	Role       Role   `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
+}
+
+func (RolePurviews) TableName() string {
+	return "sgj_users.sgj_user_role_purview"
+}
+
+type XtStorehouse struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	StorehouseCode      string `gorm:"column:storehouse_code" json:"storehouse_code" form:"storehouse_code"`
+	StorehouseName      string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`
+	StorehouseAddress   string `gorm:"column:storehouse_address" json:"storehouse_address" form:"storehouse_address"`
+	StorehouseStatus    int64  `gorm:"column:storehouse_status" json:"storehouse_status" form:"storehouse_status"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	StorehouseAdminId   int64  `gorm:"column:storehouse_admin_id" json:"storehouse_admin_id" form:"storehouse_admin_id"`
+	StorehouseAdminName string `gorm:"column:storehouse_admin_name" json:"storehouse_admin_name" form:"storehouse_admin_name"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtStorehouse) TableName() string {
+	return "xt_storehouse"
+}
+
+type VmStorehouseName struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	StorehouseName   string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`
+	StorehouseId     int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	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"`
+	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+}
+
+type VmStorehouseNameOne struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	StorehouseName   string `gorm:"column:storehouse_name" json:"storehouse_name" form:"storehouse_name"`
+	StorehouseId     int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	StockCount       int64  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+}
+
+type XtStorehouseConfig 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"`
+	StorehouseInfo     int64 `gorm:"column:storehouse_info" json:"storehouse_info" form:"storehouse_info"`
+	StorehouseOutInfo  int64 `gorm:"column:storehouse_out_info" json:"storehouse_out_info" form:"storehouse_out_info"`
+	DrugStorehouseInfo int64 `gorm:"column:drug_storehouse_info" json:"drug_storehouse_info" form:"drug_storehouse_info"`
+	DrugStorehouseOut  int64 `gorm:"column:drug_storehouse_out" json:"drug_storehouse_out" form:"drug_storehouse_out"`
+	Status             int64 `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtStorehouseConfig) TableName() string {
+	return "xt_storehouse_config"
+}
+
+type XtSecondWarehouse struct {
+	ID                int64  `gorm:"column:id" json:"id" form:"id"`
+	SecondOrderNumber string `gorm:"column:second_order_number" json:"second_order_number" form:"second_order_number"`
+	Creater           int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	RecordDate        int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Checker           int64  `gorm:"column:checker" json:"checker" form:"checker"`
+	IsCheck           int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	UserOrgId         int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status            int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime             int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	CheckTime         int64  `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	StorehouseInId    int64  `gorm:"column:storehouse_in_id" json:"storehouse_in_id" form:"storehouse_in_id"`
+	StorehouseOutId   int64  `gorm:"column:storehouse_out_id" json:"storehouse_out_id" form:"storehouse_out_id"`
+}
+
+func (XtSecondWarehouse) TableName() string {
+	return "xt_second_warehouse"
+}
+
+type XtSecondWarehouseInfo struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName             string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	SecondSpecificationName string  `gorm:"column:second_specification_name" json:"second_specification_name" form:"second_specification_name"`
+	ProjectType             string  `gorm:"column:project_type" json:"project_type" form:"project_type"`
+	SencondUnit             string  `gorm:"column:sencond_unit" json:"sencond_unit" form:"sencond_unit"`
+	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	SecondTotal             string  `gorm:"column:second_total" json:"second_total" form:"second_total"`
+	SecondOrderNumber       string  `gorm:"column:second_order_number" json:"second_order_number" form:"second_order_number"`
+	RecordDate              int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	StorehouseInId          int64   `gorm:"column:storehouse_in_id" json:"storehouse_in_id" form:"storehouse_in_id"`
+	StorehouseOutId         int64   `gorm:"column:storehouse_out_id" json:"storehouse_out_id" form:"storehouse_out_id"`
+	Creater                 int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	ProjectId               int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Remake                  string  `gorm:"column:remake" json:"remake" form:"remake"`
+	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	MinPrice                float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	WarehouseId             int64   `gorm:"column:warehouse_id" json:"warehouse_id" form:"warehouse_id"`
+}
+
+func (XtSecondWarehouseInfo) TableName() string {
+	return "xt_second_warehouse_info"
+}
 
+type VmSecondWarehouse struct {
+	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
+	SecondOrderNumber   string `gorm:"column:second_order_number" json:"second_order_number" form:"second_order_number"`
+	Creater             int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	RecordDate          int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Checker             int64  `gorm:"column:checker" json:"checker" form:"checker"`
+	IsCheck             int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	UserOrgId           int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status              int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime               int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime               int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	CheckTime           int64  `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	StorehouseInId      int64  `gorm:"column:storehouse_in_id" json:"storehouse_in_id" form:"storehouse_in_id"`
+	StorehouseOutId     int64  `gorm:"column:storehouse_out_id" json:"storehouse_out_id" form:"storehouse_out_id"`
+	StorehouseAdminName string `gorm:"column:storehouse_admin_name" json:"storehouse_admin_name" form:"storehouse_admin_name"`
 }

models/self_drug_models.go

@@ -357,6 +357,7 @@ type XtDrugWarehouseOutInfo struct {
 	Number                  string     `gorm:"column:number" json:"number" form:"number"`
 	BatchNumber             string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	XtBaseDrug              XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	StorehouseId            int64      `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (XtDrugWarehouseOutInfo) TableName() string {
@@ -414,6 +415,7 @@ type XtDrugWarehouseInfo struct {
 	XtBaseDrug                XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
 	SupplyWarehouseId         int64      `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64      `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64      `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {
@@ -480,6 +482,8 @@ type BloodDrugWarehouseInfo struct {
 	WarehouseingUnit string  `gorm:"column:warehouseing_unit" json:"warehouseing_unit" form:"warehouseing_unit"`
 	LastPrice        float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	DrugOriginPlace  string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	CountUnit        string  `json:"count_unit"`
 }
 
 type BloodDrugCancelStockInfo struct {
@@ -512,6 +516,7 @@ type BloodDrugCancelStockInfo struct {
 	Dose             float64 `json:"dose"`
 	DoseUnit         string  `json:"dose_unit"`
 	Unit             string  `json:"unit"`
+	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type BloodDrugSalesReturnInfo struct {
@@ -547,6 +552,7 @@ type BloodDrugWarehouseOutInfo 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"`
@@ -575,6 +581,7 @@ type BloodDrugWarehouseOutInfo struct {
 	Dose                    float64 `json:"dose"`
 	DoseUnit                string  `json:"dose_unit"`
 	LastPrice               float64 `json:"last_price"`
+	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type XtMonitorConfig struct {
@@ -679,6 +686,8 @@ type VmDrugWarehouseOutInfo struct {
 	Number                  string  `gorm:"column:number" json:"number" form:"number"`
 	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 	MedicalInsuranceNumber  string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 type XtDrugAdjustPrice struct {
@@ -859,6 +868,7 @@ type XtDrugInventory struct {
 	LastStockMinNumber int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
 	InventoryType      int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
 	Type               int64   `gorm:"column:type" json:"type" form:"type"`
+	StorehouseId       int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (XtDrugInventory) TableName() string {
@@ -907,6 +917,7 @@ type VmDrugInventory struct {
 	StockMinNumber     int64              `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
 	WarehouseInfoId    int64              `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
 	Children           []*XtDrugInventory `gorm:"column:children" json:"children" form:"children"`
+	StorehouseId       int64              `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type SgjDrugWarehouseOutInfo struct {

models/stock_models.go

@@ -65,6 +65,9 @@ type Warehousing struct {
 	Dealers           Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	Type              int64        `gorm:"column:type" json:"type"`
 	SupplyWarehouseId int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId      int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsSys             int64        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SecondWarehouseId int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 }
 
 func (Warehousing) TableName() string {
@@ -72,33 +75,35 @@ 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"`
-	GoodName          string  `json:"good_name"`
-	PackingUnit       string  `json:"packing_unit"`
-	TotalCount        int64   `json:"total_count"`
-	SpecificationName string  `json:"specification_name"`
-	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	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"`
+	LicenseNumber         string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StorehouseId          int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 }
 
 func (StWarehousingInfo) TableName() string {
@@ -135,6 +140,8 @@ type WarehousingInfo struct {
 	PackingPrice              float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -181,6 +188,7 @@ type VmWarehousingInfo struct {
 	PackingUnit       string      `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	Count             int64       `gorm:json:"count"`
 	PackingPrice      float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	StorehouseId      int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type WarehouseOut struct {
@@ -203,6 +211,8 @@ type WarehouseOut struct {
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
 	SupplyCancelOutId       int64        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId       int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 }
 
 func (WarehouseOut) TableName() string {
@@ -243,6 +253,9 @@ type WarehouseOutInfo struct {
 	SupplyCancelOutId       int64        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	IsSource                int64        `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64        `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64        `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -259,6 +272,7 @@ type WarehouseOutInfoNight struct {
 	WarehouseInfotId int64 `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
 	IsSys            int64 `gorm:"column:is_sys" json:"is_sys"`
 	Status           int64 `gorm:"column:status" json:"status"`
+	OrgId            int64 `gorm:"column:org_id" json:"org_id"`
 }
 
 func (WarehouseOutInfoNight) TableName() string {
@@ -341,6 +355,7 @@ type CancelStock struct {
 	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer"`
 	Type              int64                `gorm:"column:type" json:"type"`
 	XtCancelStockInfo []*XtCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"XtCancelStockInfo"`
+	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (CancelStock) TableName() string {
@@ -409,6 +424,7 @@ type AutomaticReduceDetail struct {
 	Type                    int64               `gorm:"column:type" json:"type"`
 	WarehouseOutInfo        []*WarehouseOutInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"warehouseOutInfo"`
 	ProjectId               int64               `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	StorehouseId            int64               `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (AutomaticReduceDetail) TableName() string {
@@ -487,6 +503,8 @@ type WarehouseOutInfoOne struct {
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 	SupplyCancelOutId           int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId           int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId                int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	AdminUserId                 int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 type WarehouseOutInfoTwo struct {
@@ -596,6 +614,9 @@ type VmStockFlow struct {
 	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyCancelOutId         int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 }
 
 func (VmStockFlow) TableName() string {
@@ -629,6 +650,7 @@ type CancelStockInfo struct {
 	WarehousingInfo []*WarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"xt_warehouse_info"`
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	RecordDate      int64              `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	StorehouseId    int64              `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (CancelStockInfo) TableName() string {
@@ -705,6 +727,7 @@ type VmBaseDrug struct {
 	Total                       float64                   `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit       string                    `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
 	DrugWarehouseInfo           []*VsDrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
+	DrugWarehouse               []*DrugWarehouseInfo      `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse"`
 	DrugCancelStockInfo         []*VsDrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_cancel_stock_info"`
 	DrugWarehouseOutInfo        []*VsDrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_out"`
 }
@@ -741,6 +764,7 @@ type VsDrugWarehouseInfo struct {
 	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"`
+	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (VsDrugWarehouseInfo) TableName() string {
@@ -858,6 +882,7 @@ type BloodWarehouseInfo struct {
 	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	PackingUnit       string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type XtStockAdjustPrice struct {
@@ -1048,6 +1073,7 @@ type XtStockInventory struct {
 	InventoryType     int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
 	LastStockCount    int64   `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
 	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 func (XtStockInventory) TableName() string {
@@ -1088,6 +1114,7 @@ type VmStockInventory struct {
 	InventoryType     int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
 	LastStockCount    int64   `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
 	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 }
 
 type XtStockCorrectRecord struct {
@@ -1202,3 +1229,106 @@ type PatientWarehouseInfo struct {
 func (PatientWarehouseInfo) TableName() string {
 	return "xt_warehouse_info"
 }
+
+type BloodHisDoctorAdviceInfo 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"`
+	PatientId             int64                       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId          int64                       `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	AdviceType            int64                       `gorm:"column:advice_type" json:"advice_type" form:"advice_type"`
+	AdviceDate            int64                       `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	StartTime             int64                       `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	AdviceName            string                      `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	AdviceDesc            string                      `gorm:"column:advice_desc" json:"advice_desc" form:"advice_desc"`
+	ReminderDate          int64                       `gorm:"column:reminder_date" json:"reminder_date" form:"reminder_date"`
+	SingleDose            float64                     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	SingleDoseUnit        string                      `gorm:"column:single_dose_unit" json:"single_dose_unit" form:"single_dose_unit"`
+	PrescribingNumber     float64                     `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string                      `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	DeliveryWay           string                      `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency    string                      `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	AdviceDoctor          int64                       `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	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"`
+	AdviceAffirm          string                      `gorm:"column:advice_affirm" json:"advice_affirm" form:"advice_affirm"`
+	Remark                string                      `gorm:"column:remark" json:"remark" form:"remark"`
+	StopTime              int64                       `gorm:"column:stop_time" json:"stop_time" form:"stop_time"`
+	StopReason            string                      `gorm:"column:stop_reason" json:"stop_reason" form:"stop_reason"`
+	StopDoctor            int64                       `gorm:"column:stop_doctor" json:"stop_doctor" form:"stop_doctor"`
+	StopState             int64                       `gorm:"column:stop_state" json:"stop_state" form:"stop_state"`
+	ParentId              int64                       `gorm:"column:parent_id" json:"parent_id" form:"parent_id"`
+	ExecutionTime         int64                       `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff        int64                       `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState        int64                       `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	Checker               int64                       `gorm:"column:checker" json:"checker" form:"checker"`
+	RecordDate            int64                       `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	DialysisOrderId       int64                       `gorm:"column:dialysis_order_id" json:"dialysis_order_id" form:"dialysis_order_id"`
+	CheckTime             int64                       `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState            int64                       `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	DrugSpec              float64                     `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugSpecUnit          string                      `gorm:"column:drug_spec_unit" json:"drug_spec_unit" form:"drug_spec_unit"`
+	Groupno               int64                       `gorm:"column:groupno" json:"groupno" form:"groupno"`
+	RemindType            int64                       `gorm:"column:remind_type" json:"remind_type" form:"remind_type"`
+	FrequencyType         int64                       `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount              int64                       `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay               string                      `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	TemplateId            string                      `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	Modifier              int64                       `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	DrugId                int64                       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Price                 float64                     `gorm:"column:price" json:"price" form:"price"`
+	PrescriptionId        int64                       `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	MedListCodg           string                      `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	FeedetlSn             string                      `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Day                   int64                       `gorm:"column:day" json:"day" form:"day"`
+	ChildDoctorAdvice     []*BloodHisDoctorAdviceInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"child"`
+	Diagnosis             int64                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	Way                   int64                       `gorm:"column:way" json:"way" form:"way"`
+	HospApprFlag          int64                       `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
+	LmtUsedFlag           int64                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+}
+
+func (BloodHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type BloodHisPrescriptionProject struct {
+	ID                 int64                          `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64                          `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64                        `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64                          `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status             int64                          `gorm:"column:status" json:"status" form:"status"`
+	Ctime              int64                          `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64                          `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId          int64                          `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64                          `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64                          `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64                          `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string                         `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string                         `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string                         `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string                         `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string                         `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string                         `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string                         `gorm:"column:day" json:"day" form:"day"`
+	Remark             string                         `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string                         `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64                          `gorm:"column:type" json:"type" form:"type"`
+	Doctor             int64                          `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime      int64                          `gorm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff     int64                          `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState     int64                          `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime          int64                          `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState         int64                          `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker            int64                          `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime          int64                          `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId             int64                          `gorm:"column:team_id" json:"team_id" form:"team_id"`
+	FrequencyType      int64                          `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount           int64                          `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay            string                         `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	ChildDoctorAdvice  []*BloodHisPrescriptionProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ProjectId" json:"child"`
+}
+
+func (BloodHisPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}

service/device_service.go

@@ -437,7 +437,7 @@ func GetAllDeviceNumbers(orgID int64, record_date int64, schedule_type int64) ([
 
 func GetDeviceNumberByID(orgID int64, numberID int64) (*models.DeviceNumber, error) {
 	var number models.DeviceNumber
-	err := readDb.Model(&models.DeviceNumber{}).Where("org_id = ? AND id = ?", orgID, numberID).First(&number).Error
+	err := readDb.Model(&models.DeviceNumber{}).Where("org_id = ? AND id = ? ", orgID, numberID).First(&number).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -495,7 +495,7 @@ func UpdateDeviceNumber(number *models.DeviceNumber) error {
 		tx.Rollback()
 		return updateNumberErr
 	}
-	updateDeviceErr := tx.Model(&models.Device{}).Where("org_id = ? AND device_number_id = ?", number.OrgID, number.ID).Updates(map[string]interface{}{"device_number": number.Number, "sort": number.Sort}).Error
+	updateDeviceErr := tx.Model(&models.Device{}).Where("org_id = ? AND device_number_id = ?", number.OrgID, number.ID).Updates(map[string]interface{}{"device_number": number.Number}).Error
 	if updateDeviceErr != nil {
 		tx.Rollback()
 		return updateDeviceErr

service/dialysis_service.go

@@ -760,7 +760,7 @@ func GetDialysisWatchByKeyword(orgID int64, keyword string, schedulType int64, p
 
 	db := readDb.
 		Model(&models.DialysisSchedule{}).
-		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DeviceNumber", "org_id = ?", orgID).
 		// Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
 		Preload("TreatmentMode", "status = 1").
 		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
@@ -1354,8 +1354,8 @@ func SaveHisDoctorAdvice(advice *models.HisDoctorAdviceInfo) (err error) {
 
 func GetGoodInfoMation(orgid int64) (goodinfo []*models.GoodInfo, err error) {
 
-	//	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1").Find(&goodinfo).Error
-	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodinfo).Error
+	err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Preload("GoodSotckInfo", "stock_count > 0 and status = 1").Find(&goodinfo).Error
+	//err = XTReadDB().Model(&goodinfo).Where("org_id = ? and status = 1 AND  find_in_set('停用',good_status) = 0", orgid).Find(&goodinfo).Error
 	return goodinfo, err
 }
 

service/doctor_schedule_service.go

@@ -92,6 +92,12 @@ func GetAllDoctorList(orgid int64, appid int64) (role []*models.XTSgjUserAdminRo
 	return role, err
 }
 
+func GetAllDoctorListSix(orgid int64, appid int64) (role []*models.XTSgjUserAdminRole, err error) {
+
+	err = UserReadDB().Model(&role).Where("org_id =? and app_id = ? and status = 1", orgid, appid).Order("sort desc").Find(&role).Error
+	return role, err
+}
+
 func GetAllNurseList(orgid int64, appid int64) (role []*models.XTSgjUserAdminRole, err error) {
 
 	err = UserReadDB().Model(&role).Where("org_id = ? and app_id = ? and user_type =3 and status =1", orgid, appid).Order("sort desc").Find(&role).Error

service/gobal_config_service.go

@@ -273,7 +273,7 @@ func GetExportHisOrderList(user_org_id int64, start_time int64, end_time int64,
 	return
 }
 
-func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64) (drugInfo []*models.BloodDrugWarehouseInfo, total int64, err error) {
+func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64) (drugInfo []*models.BloodDrugWarehouseInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
@@ -293,8 +293,9 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	if orgid > 0 {
 		db = db.Where("x.org_id =?", orgid)
 	}
-	if orderType > 0 {
-		db = db.Where("x.type = ?", orderType)
+
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
 
 	if len(keyword) > 0 {
@@ -304,9 +305,9 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).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.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.storehouse_id,x.max_unit as count_unit,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.id desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
 	}
 
 	return drugInfo, total, err
@@ -347,7 +348,7 @@ func GetDrugReturnOrder(startime int64, endtime int64, orgid int64, orderType in
 	return returninfo, total, err
 }
 
-func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64) (outinfo []*models.BloodDrugWarehouseOutInfo, total int64, err error) {
+func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64) (outinfo []*models.BloodDrugWarehouseOutInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
@@ -369,21 +370,25 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 		db = db.Where("x.type = ?", orderType)
 	}
 
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+
 	if len(keyword) > 0 {
 		db = db.Joins("left join sgj_xt.xt_drug_warehouse_out as o on o.id = x.warehouse_out_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("x.id")
 		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ?  or r.user_name like ?", likeKey, likeKey, likeKey)
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	} else {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	}
 
 	return outinfo, total, err
 }
 
-func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string) (info []*models.BloodDrugCancelStockInfo, err error) {
+func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, storehouse_id int64) (info []*models.BloodDrugCancelStockInfo, err error) {
 	likeKey := "%" + keyword + "%"
 	db := XTReadDB().Table("xt_drug_cancel_stock_info as x").Where("x.status =1")
 	dbOne := XTReadDB().Table("xt_base_drug as s").Where("s.status =1")
@@ -404,17 +409,20 @@ func GetDrugCancelOrderPrint(startime int64, endtime int64, orgid int64, orderTy
 	if len(keyword) > 0 {
 		db = db.Where("x.order_number like ? or s.drug_spec like ? or t.creater like ?", likeKey, likeKey, likeKey)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
 	} else {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Group("x.drug_id").Scan(&info).Error
 	}
 
 	return info, err
 }
 
-func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64) (cancel []*models.BloodDrugCancelStockInfo, total int64, err error) {
+func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType int64, manufacturerId int64, keyword string, page int64, limit int64, storehouse_id int64) (cancel []*models.BloodDrugCancelStockInfo, total int64, err error) {
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
@@ -434,6 +442,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	if orderType > 0 {
 		db = db.Where("x.type = ? ", orderType)
 	}
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
 	if len(keyword) > 0 {
 		db = db.Joins("left join sgj_xt.xt_drug_cancel_stock as o on o.id = x.cancel_stock_id  left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = o.creater").Group("o.id")
 
@@ -441,9 +452,9 @@ func GetDrugCancelOrder(startime int64, endtime int64, orgid int64, orderType in
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	} else {
-		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
+		err = db.Select("x.id,x.max_unit as unit,x.drug_id,x.cancel_stock_id,x.count,x.price,x.total,x.product_date,x.expiry_date,x.ctime,x.org_id,x.order_number,x.type,x.dealer,x.manufacturer,x.retail_price,x.retail_total_price,x.number,x.storehouse_id,s.drug_name,s.drug_type,s.drug_spec,s.min_unit,t.creater,s.dose,s.dose_unit,s.min_number,s.max_unit").Joins("left join xt_base_drug as s on s.id = x.drug_id and s.org_id = ? and s.status = 1", orgid).Joins("left join xt_drug_cancel_stock as t on t.id = x.cancel_stock_id and t.org_id = ? and t.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&cancel).Error
 	}
 
 	return cancel, total, err
@@ -613,7 +624,7 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 	return list, total, err
 }
 
-func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcategory int64, startime int64, endtime int64, orgid int64) (drug []*models.VmBaseDrug, total int64, err error) {
+func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcategory int64, startime int64, endtime int64, orgid int64, storehouse_id int64, drug_id int64) (drug []*models.VmBaseDrug, total int64, err error) {
 
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_base_drug").Where("status = 1")
@@ -629,6 +640,10 @@ func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcatego
 		db = db.Where("drug_name like ?", likeKey)
 	}
 
+	if drug_id > 0 {
+		db = db.Where("id = ?", drug_id)
+	}
+
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("ctime desc").Preload("DrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
 		if startime > 0 {
 			db = db.Where("ctime>=?", startime)
@@ -636,6 +651,9 @@ func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcatego
 		if endtime > 0 {
 			db = db.Where("ctime<=?", endtime)
 		}
+		if storehouse_id > 0 {
+			db = db.Where("storehouse_id = ?", storehouse_id)
+		}
 		return db.Where("status = 1")
 	}).Preload("DrugCancelStockInfo", func(db *gorm.DB) *gorm.DB {
 		if startime > 0 {
@@ -645,6 +663,17 @@ func GetAllBaseDurgListCount(page int64, limit int64, keyword string, drugcatego
 			db = db.Where("ctime<=?", endtime)
 		}
 		return db.Where("status = 1")
+	}).Preload("DrugWarehouse", func(db *gorm.DB) *gorm.DB {
+		if startime > 0 {
+			db = db.Where("ctime>=?", startime)
+		}
+		if endtime > 0 {
+			db = db.Where("ctime<=?", endtime)
+		}
+		if storehouse_id > 0 {
+			db = db.Where("storehouse_id = ?", storehouse_id)
+		}
+		return db.Group("drug_id,storehouse_id").Where("status = 1")
 	}).Preload("DrugWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
 		if startime > 0 {
 			db = db.Where("ctime>=?", startime)
@@ -715,7 +744,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 = ? and status = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ? and status = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&drug).Error
 	return drug, total, err
 }
 
@@ -830,7 +859,7 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 		db = db.Where("x.warehouse_out_id = ?", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price as total_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,t.retail_price ,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price as total_price,x.retail_total_price,x.storehouse_id,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,x.admin_user_id,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,t.retail_price ,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 

service/his_service.go

@@ -285,7 +285,7 @@ func GetNewScheduleHisPatientList(org_id int64, keywords string, record_date int
 }
 
 func GetAllBaseDrugStockList(org_id int64) (drugs []*models.BaseDrugLib, err error) {
-	err = readDb.Model(&models.BaseDrugLib{}).Where("user_org_id = ? AND status = 1", org_id).Find(&drugs).Error
+	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? AND status = 1", org_id).Find(&drugs).Error
 	return
 }
 
@@ -711,7 +711,9 @@ type BaseDrugLib struct {
 	DrugDay                     string  `gorm:"column:drug_day" json:"drug_day" form:"drug_day"`
 	Total                       float64 `gorm:"column:total" json:"total" form:"total"`
 	PrescribingNumberUnit       string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
-
+	BatchRetaiPrice             float64 `gorm:"column:batch_retai_price" json:"batch_retai_price" form:"batch_retai_price"`
+	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
@@ -727,6 +729,8 @@ func GetAllDrugLibList(org_id int64) (list []*BaseDrugLib, err error) {
 	err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Preload("OtherDrugWarehouseInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("(status = 1 and stock_max_number > 0)  or  (status = 1  AND stock_min_number >0)")
 	}).Find(&list).Error
+
+	//err = readDb.Model(&BaseDrugLib{}).Where("org_id = ?  AND status = 1 AND  find_in_set('停用',drug_status) = 0", org_id).Find(&list).Error
 	return
 }
 

service/manage_center_service.go

@@ -174,7 +174,7 @@ func FindBaseDrugLibRecord(org_id int64, id int64) (lib models.BaseDrugLib, err
 }
 
 func FindBaseDrugLibRecordSeven(org_id int64, id int64) (lib models.BaseDrugLibSeven, err error) {
-	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
+	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
 	return
 }
 

service/mobile_dialysis_service.go

@@ -2770,7 +2770,7 @@ func GetLastDialysisGoods(patient_id int64, orgID int64, record_time int64) (goo
 
 	err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time < ? AND count > 0", patient_id, orgID, record_time).Select("record_time").Group("record_time").Order("record_time asc").Scan(&Id).Error
 	if len(Id) > 0 {
-		fmt.Println("ids232323223322233233233322332", Id)
+
 		err = readDb.Model(&AutomaticReduceDetail{}).Where("patient_id = ? AND org_id = ? AND status=1 AND record_time = ? AND count > 0", patient_id, orgID, Id[len(Id)-1].RecordTime).Preload("VMGoodInfo", "status = 1 AND org_id = ? ", orgID).Preload("GoodsType", "status = 1 AND (org_id = ? OR org_id = 0)  ", orgID).Find(&goodUser).Error
 	}
 	return

service/patient_service.go

@@ -822,7 +822,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot}).Error
 	return err
 }
 

service/self_drug_service.go

@@ -821,7 +821,7 @@ func GetLastDrugWarehouseOutInfo(drugid int64, warehouseOutId int64, orgid int64
 	return info, err
 }
 
-func PostSearchDrugWarehouseList(keyword string, orgid int64) (info []*models.BloodDrugWarehouseInfo, err error) {
+func PostSearchDrugWarehouseList(keyword string, orgid int64, storehouse_id int64) (info []*models.BloodDrugWarehouseInfo, err error) {
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status")
 	fmt.Println(table)
@@ -829,7 +829,10 @@ func PostSearchDrugWarehouseList(keyword string, orgid int64) (info []*models.Bl
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Group("x.drug_id").Select("x.id,x.warehousing_id,x.drug_id,t.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_origin_place,t.drug_name,t.min_unit,x.manufacturer,t.retail_price,t.max_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.drug_origin_place").Joins("left join xt_base_drug as t on t.id = x.drug_id").Where("t.drug_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	err = db.Group("x.drug_id").Select("x.id,x.warehousing_id,x.drug_id,t.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.remark,x.warehousing_order,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.batch_number,x.storehouse_id,t.drug_origin_place,t.drug_name,t.min_unit,x.manufacturer,t.retail_price,t.max_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.drug_origin_place").Joins("left join xt_base_drug as t on t.id = x.drug_id").Where("t.drug_name like ? and t.org_id = ?", likeKey, orgid).Order("x.ctime desc").Scan(&info).Error
 	return info, err
 
 }
@@ -888,7 +891,7 @@ func CreateDrugDamage(damage models.XtDrugDamage) error {
 	return err
 }
 
-func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64) (adjust []*models.VmDrugInventory, total int64, err error) {
+func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword string, limit int64, page int64, storehouse_id int64) (adjust []*models.VmDrugInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1 and type = 4")
@@ -910,7 +913,10 @@ func GetDrugDamageList(startime int64, endtime int64, orgId int64, keyword strin
 	if endtime > 0 {
 		db = db.Where("x.ctime <=?", endtime)
 	}
-	err = db.Group("x.drug_id").Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.number,x.drug_origin_place,x.warehouse_info_id,x.batch_number,x.stock_max_number,x.stock_min_number,t.min_number,t.max_unit,t.min_unit,t.min_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	err = db.Group("x.drug_id").Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.new_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.number,x.drug_origin_place,x.warehouse_info_id,x.batch_number,x.stock_max_number,x.stock_min_number,x.storehouse_id,t.min_number,t.max_unit,t.min_unit,t.min_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&adjust).Error
 	return adjust, total, err
 }
 
@@ -968,9 +974,9 @@ func GetDrugDamagePrint(ids []string) (damage []*models.XtDrugDamage, err error)
 	return damage, err
 }
 
-func GetWarehoseInfoById(id int64) (info []*models.XtDrugWarehouseInfo, err error) {
+func GetWarehoseInfoById(id int64, storehouse_id int64) (info []*models.XtDrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Model(&info).Where("drug_id=? and status = 1", id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
+	err = XTReadDB().Model(&info).Where("drug_id=? and status = 1 and storehouse_id = ?", id, storehouse_id).Preload("XtBaseDrug", "status= 1").Find(&info).Error
 	return info, err
 }
 
@@ -1088,8 +1094,7 @@ func GetDrugInventoryPrintList(ids []string) (info []*models.XtDrugInventory, er
 	return info, err
 }
 
-func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid int64) (list []*models.VmDrugInventory, total int64, err error) {
-	fmt.Println("startdate", limit, page)
+func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid int64, storehouse_id int64) (list []*models.VmDrugInventory, total int64, err error) {
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_drug_inventory as x").Where("x.status = 1")
@@ -1102,7 +1107,10 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	if storehouse_id > 0 {
+		db = db.Where("x.storehouse_id = ?", storehouse_id)
+	}
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
 	return list, total, err
 }
 

service/supply_service.go

@@ -764,12 +764,24 @@ func GetSupplySupplyWarehouseId(id int64, orgid int64) (models.WarehousingInfo,
 	return info, err
 }
 
+func GetSupplySupplyWarehouseIdSeven(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
 func GetDrugSupplyWarehouseId(id int64, orgid int64) (models.DrugWarehouseInfo, error) {
 	info := models.DrugWarehouseInfo{}
 	err := XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
 	return info, err
 }
 
+func GetDrugSupplyWarehouseIdSeven(id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
 func UpdateDrugSupplyWarehousingInfo(id int64, orgid int64) error {
 
 	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
@@ -853,12 +865,12 @@ func CreateDrugFlowSix(drugflow []*models.DrugFlow) (err error) {
 	if len(drugflow) > 0 {
 		utx := writeDb.Begin()
 		if len(drugflow) > 0 {
-			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit,supply_warehouse_id,supply_warehouse_detail_info) VALUES "
+			thisSQL := "INSERT INTO xt_drug_flow (warehousing_id, drug_id, number,batch_number,count,user_org_id,patient_id,system_time,consumable_type,is_sys,warehousing_order,warehouse_out_id,warehouse_out_order_number,is_edit,cancel_stock_id,cancel_order_number,manufacturer,dealer,creator,update_creator,status,ctime,mtime,price,warehousing_detail_id,warehouse_out_detail_id,cancel_out_detail_id,expire_date,product_date,max_unit,min_unit,supply_warehouse_id,supply_warehouse_detail_info,storehouse_id) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range drugflow {
 
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Number)
@@ -893,6 +905,7 @@ func CreateDrugFlowSix(drugflow []*models.DrugFlow) (err error) {
 				insertData = append(insertData, info.MinUnit)
 				insertData = append(insertData, info.SupplyWarehouseId)
 				insertData = append(insertData, info.SupplyWarehouseDetailInfo)
+				insertData = append(insertData, info.StorehouseId)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -1038,22 +1051,22 @@ func ModfySupplyWarehouseOut(warehousing_id int64, orgid int64) error {
 	return err
 }
 
-func FindWarehousingInfoTwenTy(goodId int64, supply_warehouse_detail_info int64, source int64) (models.WarehousingInfo, error) {
-	fmt.Println("source232232332232323232323", source)
+func FindWarehousingInfoTwenTy(goodId int64, supply_warehouse_detail_info int64, source int64, storehouse_id int64) (models.WarehousingInfo, error) {
+
 	info := models.WarehousingInfo{}
 	var err error
 	if source == 1 {
-		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and supply_warehouse_detail_info =?", goodId, supply_warehouse_detail_info).Find(&info).Error
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and supply_warehouse_detail_info =? and storehouse_id = ?", goodId, supply_warehouse_detail_info, storehouse_id).Find(&info).Error
 
 	}
 	if source == 2 {
-		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1", goodId).Find(&info).Error
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and storehouse_id = ?", goodId, storehouse_id).Find(&info).Error
 
 	}
 	return info, err
 }
 
-func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64, source int64) (list []*models.VmDrugWarehouseInfo, err error) {
+func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64, source int64, storehouse_id int64) (list []*models.VmDrugWarehouseInfo, err error) {
 
 	if source == 1 {
 		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
@@ -1065,6 +1078,9 @@ func GetDrugTotalCountTwenTy(drugid int64, supply_warehouse_detail_info int64, s
 		if supply_warehouse_detail_info > 0 {
 			db = db.Where("x.supply_warehouse_detail_info = ?", supply_warehouse_detail_info)
 		}
+		if storehouse_id > 0 {
+			db = db.Where("x.storehouse_id= ?", storehouse_id)
+		}
 		err = db.Select("x.drug_id,x.stock_max_number,x.stock_min_number,d.min_number,d.max_unit,d.min_unit,x.max_unit as count_unit,x.supply_warehouse_detail_info").Joins("left join xt_base_drug as d on d.id = x.drug_id").Scan(&list).Error
 	}