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

controllers/data_api_controller.go

@@ -512,11 +512,11 @@ func configChildFormData(dataconfig *models.Dataconfig, data []byte) (code int)
 			return
 		}
 		parent_id := int64(configBody["parent_id"].(float64))
-		if parent_id <= 0 {
-			utils.ErrorLog("parent_id <= 0")
-			code = enums.ErrorCodeParamWrong
-			return
-		}
+		//if parent_id <= 0 {
+		//	utils.ErrorLog("parent_id <= 0")
+		//	code = enums.ErrorCodeParamWrong
+		//	return
+		//}
 		dataconfig.ParentId = parent_id
 
 		if configBody["name"] == nil || reflect.TypeOf(configBody["name"]).String() != "string" {
@@ -525,11 +525,11 @@ func configChildFormData(dataconfig *models.Dataconfig, data []byte) (code int)
 			return
 		}
 		name, _ := configBody["name"].(string)
-		if len(name) == 0 {
-			utils.ErrorLog("len(name) == 0")
-			code = enums.ErrorCodeParamWrong
-			return
-		}
+		//if len(name) == 0 {
+		//	utils.ErrorLog("len(name) == 0")
+		//	code = enums.ErrorCodeParamWrong
+		//	return
+		//}
 		dataconfig.Name = name
 	}
 	return

controllers/device_api_controller.go

@@ -53,7 +53,7 @@ type DeviceAPIController struct {
 // /api/device/initdata [get] GetDeviceManageInitData
 func (this *DeviceAPIController) GetDeviceManageInitData() {
 	adminInfo := this.GetAdminUserInfo()
-	zones, getZonesErr := service.GetAllValidDeviceZones(adminInfo.CurrentOrgId)
+	zones, getZonesErr := service.GetAllValidDeviceZonesOne(adminInfo.CurrentOrgId)
 	if getZonesErr != nil {
 		this.ErrorLog("获取设备分区列表失败:%v", getZonesErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
@@ -503,7 +503,7 @@ func (this *DeviceAPIController) DisableDevice() {
 // /api/device/zones [get] GetZones
 func (this *DeviceAPIController) GetZones() {
 	adminInfo := this.GetAdminUserInfo()
-	zones, getZonesErr := service.GetAllValidDeviceZones(adminInfo.CurrentOrgId)
+	zones, getZonesErr := service.GetAllValidDeviceZonesOne(adminInfo.CurrentOrgId)
 	if getZonesErr != nil {
 		this.ErrorLog("获取设备分区列表失败:%v", getZonesErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/his_summary_controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"XT_New/enums"
 	"XT_New/service"
+	"fmt"
 	"github.com/astaxie/beego"
 	"time"
 )
@@ -16,6 +17,9 @@ func HisSummaryApiRegistRouters() {
 	beego.Router("/api/gethissummarydetaillist", &HisSummaryApiController{}, "Get:GetHisSummaryDetailList")
 	beego.Router("/api/his/getgatherdetailist", &HisSummaryApiController{}, "Get:GetGatherDetaiList")
 	beego.Router("/api/his/getdetailpatients", &HisSummaryApiController{}, "Get:GetDetailPatients")
+
+	beego.Router("/api/his/gethisorderlist", &HisSummaryApiController{}, "Get:GetHisOrderList")
+	beego.Router("/api/his/gethisadviceorderlist", &HisSummaryApiController{}, "Get:GetHisAdviceOrderList")
 }
 
 func (this *HisSummaryApiController) GetHisSummaryDetailList() {
@@ -633,3 +637,79 @@ func (this *HisSummaryApiController) GetDetailPatients() {
 
 	}
 }
+
+func (this *HisSummaryApiController) GetHisOrderList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	groupList, _ := service.GetOrderInfoList(patient_id, startRecordDateTime, endRecordDateTime, orgId)
+	fmt.Println("groupList32332323232232332322323", groupList)
+	//list, err := service.GetHisOrderListTwenty(patient_id, startRecordDateTime, endRecordDateTime, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"groupList": groupList,
+			//   "list": list,
+
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+}
+
+func (this *HisSummaryApiController) GetHisAdviceOrderList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetOrderInfoList(patient_id, startRecordDateTime, endRecordDateTime, orgId)
+
+	//drugList, err := service.GetAllDrugLibList(orgId)
+	//
+	//goodList, err := service.GetAllGoodList(orgId)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+			//"drugList":drugList,
+			//"goodList":goodList,
+		})
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+
+	}
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -115,6 +115,11 @@ func (c *CheckWeightApiController) SaveBloodPressure() {
 				evaluation.BloodAccessPartId = lastPredialysisEvaluation.BloodAccessPartId
 				evaluation.BloodAccessPartOperaId = lastPredialysisEvaluation.BloodAccessPartOperaId
 				evaluation.AdditionalWeight = lastPredialysisEvaluation.AdditionalWeight // 衣物重
+
+				//从化益达 备注默认上一次数据
+				if adminUserInfo.Org.Id == 10318 {
+					evaluation.Remark = lastPredialysisEvaluation.Remark
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()
@@ -264,6 +269,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 == 53 {
 	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 == 48 || adminUserInfo.Org.Id == 10345 {
 		dewater_amount = dewater_amount * 1000
 	}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -391,7 +391,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	schedual, _ := service.MobileGetSchedualDetailOne(adminInfo.Org.Id, patientID, date.Unix())
 	go func() {
 		patient, _ = service.FindPatientByIdWithDiseases(adminInfo.Org.Id, patientID)
-		fmt.Println("patient23333223322323", patient.TrobleShoot)
+
 		ch <- struct{}{}
 	}()
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1137,7 +1137,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 					if prescribing_number_total <= total {
 						if medical.IsUse == 2 {
-							config, _ := service.GetDrugOpenConfig(adminInfo.Org.Id)
+							config, _ := service.GetDrugOpenConfigOne(adminInfo.Org.Id)
 							if config.IsOpen != 1 {
 								service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 								//更新字典里面的库存

controllers/stock_in_api_controller.go

@@ -288,6 +288,8 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 				license_number, _ := items["license_number"].(string)
 
+
+				register_number, _ := items["register_number"].(string)
 				//入库单表格
 				warehouseInfo := &models.WarehousingInfo{
 					ID:               id,
@@ -313,9 +315,34 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					PackingPrice:     packing_price,
 					StorehouseId:     storehouse_id,
 					IsCheck:          2,
+					RegisterNumber:   register_number,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
+				flow := &models.VmStockFlow{
+					WarehousingOrder:    warehousing.WarehousingOrder,
+					WarehousingId:       warehousing.ID,
+					GoodId:              good_id,
+					Number:              number,
+					ProductDate:         productDates,
+					ExpireDate:          expiryDates,
+					Count:               warehousing_count,
+					Price:               price,
+					Status:              1,
+					Ctime:               ctime,
+					UserOrgId:           adminUserInfo.CurrentOrgId,
+					Manufacturer:        manufacturer,
+					Dealer:              dealer,
+					LicenseNumber:       license_number,
+					IsEdit:              1,
+					Creator:             adminUserInfo.AdminUser.Id,
+					SystemTime:          operation_time,
+					ConsumableType:      1,
+					WarehousingDetailId: warehouseInfo.ID,
+					StorehouseId:        storehouse_id,
+					RegisterNumber:      register_number,
+				}
+				stockFlow = append(stockFlow, flow)
 			}
 		}
 	}
@@ -323,6 +350,30 @@ func (c *StockManagerApiController) CreateWarehouse() {
 	for _, item := range warehousingInfo {
 		if item.ID == 0 {
 			service.CreatedWarehouseingDetail(item)
+		service.CreatedWarehouseingDetail(item)
+		warehousinginfo, _ := service.GetLastWarehousingInfo(item.GoodId)
+		flow := models.VmStockFlow{
+			WarehousingOrder:    item.WarehousingOrder,
+			WarehousingId:       item.WarehousingId,
+			GoodId:              item.GoodId,
+			Number:              item.Number,
+			ProductDate:         item.ProductDate,
+			ExpireDate:          item.ExpiryDate,
+			Count:               item.StockCount,
+			Price:               item.Price,
+			Status:              1,
+			Ctime:               ctime,
+			UserOrgId:           item.OrgId,
+			Manufacturer:        item.Manufacturer,
+			Dealer:              item.Dealer,
+			LicenseNumber:       item.LicenseNumber,
+			IsEdit:              1,
+			Creator:             adminUserInfo.AdminUser.Id,
+			SystemTime:          operation_time,
+			ConsumableType:      1,
+			WarehousingDetailId: warehousinginfo.ID,
+			StorehouseId:        storehouse_id,
+			RegisterNumber:      item.RegisterNumber,
 		}
 		if item.ID > 0 {
 			service.UpdateWarehouseDetail(item, item.ID)
@@ -564,6 +615,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 				manufacturer := int64(items["manufacturer"].(float64))
 				dealer := int64(items["dealer"].(float64))
 				license_number, _ := items["license_number"].(string)
+				register_number, _ := items["register_number"].(string)
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -595,6 +647,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
 						IsCheck:          2,
+						RegisterNumber:   register_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -622,6 +675,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						LicenseNumber:    license_number,
 						PackingPrice:     packing_price,
 						StorehouseId:     storehouse_id,
+						RegisterNumber:   register_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -646,6 +700,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						ConsumableType:      1,
 						WarehousingDetailId: warehouseInfo.ID,
 						StorehouseId:        storehouse_id,
+						RegisterNumber:      register_number,
 					}
 
 					stockFlow = append(stockFlow, flow)
@@ -656,11 +711,202 @@ func (c *StockManagerApiController) EditWarehouse() {
 	var errs error
 	if len(warehousingInfo) > 0 {
 		errs = service.CreateWarehousingInfo(warehousingInfo)
+
+		for _, its := range warehousingInfo {
+			//查询
+			info, _ := service.GetLastGoodWarehouseInfo(its.GoodId)
+			flows := models.VmStockFlow{
+				WarehousingOrder:    info.WarehousingOrder,
+				WarehousingId:       info.ID,
+				GoodId:              info.GoodId,
+				Number:              info.Number,
+				ProductDate:         info.ProductDate,
+				ExpireDate:          info.ExpiryDate,
+				Count:               info.WarehousingCount,
+				Price:               info.Price,
+				Status:              1,
+				Ctime:               ctime,
+				UserOrgId:           adminUserInfo.CurrentOrgId,
+				Manufacturer:        info.Manufacturer,
+				Dealer:              info.Dealer,
+				LicenseNumber:       info.LicenseNumber,
+				IsEdit:              1,
+				Creator:             adminUserInfo.AdminUser.Id,
+				SystemTime:          ctime,
+				ConsumableType:      1,
+				WarehousingDetailId: info.ID,
+				StorehouseId:        storehouse_id,
+				RegisterNumber:      info.RegisterNumber,
+			}
+			_, errcodescode := service.GetGoodStockFlowInfo(info.ID, info.GoodId)
+
+			if errcodescode == gorm.ErrRecordNotFound {
+				service.CreateStockFlowOne(flows)
+			}
+
+			//改变库存
+			good, _ := service.GetLastInfoMationById(info.GoodId)
+			warhouseCount := strconv.FormatInt(info.WarehousingCount, 10)
+			total, _ := strconv.ParseFloat(warhouseCount, 64)
+			goodInfo := models.GoodInfo{
+				Total: good.Total + total,
+			}
+			errcodescode = service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+			fmt.Println(errcodescode)
+
+			//查询该机构默认仓库
+			storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+			//查询剩余库存
+			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, info.GoodId, adminUserInfo.CurrentOrgId)
+			var sum_count int64
+			var sum_in_count int64
+			for _, item := range goodList {
+				sum_count += item.StockCount
+				sum_in_count += item.WarehousingCount
+			}
+			service.UpdateGoodByGoodId(info.GoodId, sum_count, sum_in_count, info.OrgId)
+		}
 	}
 
 	if len(upDateWarehousingInfo) > 0 {
 		for _, item := range upDateWarehousingInfo {
 			service.UpdateWarehouseInfoByGoodIdOne(item, item.ID)
+			var total int64
+			//获取该批次该型号的库存
+			info, _ := service.GetLastWarehousingByIdOne(item.ID, item.GoodId)
+
+			//增加库存
+			if item.WarehousingCount > info.WarehousingCount {
+
+				total = item.WarehousingCount - info.WarehousingCount
+				goodinfo := models.WarehousingInfo{
+					WarehousingCount: item.WarehousingCount,
+					StockCount:       info.StockCount + total,
+					Price:            item.Price,
+					Manufacturer:     item.Manufacturer,
+					Number:           item.Number,
+					ProductDate:      item.ProductDate,
+					ExpiryDate:       item.ExpiryDate,
+					LicenseNumber:    item.LicenseNumber,
+					Dealer:           item.Dealer,
+					Remark:           item.Remark,
+					PackingPrice:     item.PackingPrice,
+					StorehouseId:     storehouse_id,
+					RegisterNumber:   item.RegisterNumber,
+				}
+
+				//改变库存
+				good, _ := service.GetLastInfoMationById(info.GoodId)
+				warhouseCount := strconv.FormatInt(total, 10)
+				all_total, _ := strconv.ParseFloat(warhouseCount, 64)
+				goodInfo := models.GoodInfo{
+					Total: good.Total + all_total,
+				}
+				service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
+				//查询该机构默认仓库
+				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+				//查询剩余库存
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+				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)
+			}
+
+			if item.WarehousingCount < info.WarehousingCount {
+
+				total = info.WarehousingCount - item.WarehousingCount
+				goodinfo := models.WarehousingInfo{
+					WarehousingCount: item.WarehousingCount,
+					StockCount:       info.StockCount - total,
+					Price:            item.Price,
+					Manufacturer:     item.Manufacturer,
+					Number:           item.Number,
+					ProductDate:      item.ProductDate,
+					ExpiryDate:       item.ExpiryDate,
+					LicenseNumber:    item.LicenseNumber,
+					Dealer:           item.Dealer,
+					Remark:           item.Remark,
+					PackingPrice:     item.PackingPrice,
+					StorehouseId:     storehouse_id,
+					RegisterNumber:   item.RegisterNumber,
+				}
+
+				//改变库存
+				good, _ := service.GetLastInfoMationById(info.GoodId)
+				warhouseCount := strconv.FormatInt(total, 10)
+				all_total, _ := strconv.ParseFloat(warhouseCount, 64)
+				goodInfo := models.GoodInfo{
+					Total: good.Total - all_total,
+				}
+				service.UpdateGoodInfoMation(info.GoodId, goodInfo)
+				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
+				//查询该机构默认仓库
+				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+				//查询剩余库存
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+				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)
+			}
+
+			if item.WarehousingCount == info.WarehousingCount {
+				goodinfo := models.WarehousingInfo{
+					WarehousingCount: item.WarehousingCount,
+					StockCount:       info.StockCount,
+					Price:            item.Price,
+					Manufacturer:     item.Manufacturer,
+					Number:           item.Number,
+					ProductDate:      item.ProductDate,
+					ExpiryDate:       item.ExpiryDate,
+					LicenseNumber:    item.LicenseNumber,
+					Dealer:           item.Dealer,
+					Remark:           item.Remark,
+					PackingPrice:     item.PackingPrice,
+					StorehouseId:     storehouse_id,
+					RegisterNumber:   item.RegisterNumber,
+				}
+				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
+				//查询该机构默认仓库
+				storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+				//查询剩余库存
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+				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)
+			}
+
+		}
+	}
+
+	if len(stockFlow) > 0 {
+		for _, item := range stockFlow {
+			flow := models.VmStockFlow{
+				Count:          item.Count,
+				Number:         item.Number,
+				ProductDate:    item.ProductDate,
+				ExpireDate:     item.ExpireDate,
+				Price:          item.Price,
+				Manufacturer:   item.Manufacturer,
+				Dealer:         item.Dealer,
+				LicenseNumber:  item.LicenseNumber,
+				StorehouseId:   storehouse_id,
+				RegisterNumber: item.RegisterNumber,
+			}
+			parseDateErr := service.UpdatedStockFlowByGoodIdOne(item.WarehousingId, item.GoodId, flow)
+			fmt.Println(parseDateErr)
 		}
 	}
 
@@ -1220,6 +1466,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				}
 				license_number := items["license_number"].(string)
 
+
+				register_number := items["register_number"].(string)
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					ID:                      id,
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1246,6 +1494,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					BuyPrice:                buy_price,
 					StockCount:              stock_count,
 					IsCheck:                 2,
+					RegisterNumber:          register_number,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1576,6 +1825,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				license_number := items["license_number"].(string)
 
+				register_number := items["register_number"].(string)
+
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				expiry_date := items["expiry_date"].(string)
@@ -1688,6 +1939,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						StorehouseId:            storehouse_id,
 						AdminUserId:             admin_user_id,
 						StockCount:              stock_count,
+						RegisterNumber:          register_number,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -1980,6 +2232,276 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 			//}
 			//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
 
+			//1.查询该耗材该批次的最后一次出库记录
+			lastGood, _ := service.GetLastGoodInformationByGoodId(item.GoodId, item.WarehouseInfotId, item.OrgId)
+
+			//如果出库数量大于 最后一次批次的数量(那么要进行出库)
+
+			if item.Count > lastGood.Count {
+
+				//查询该耗材是否还有库存
+				warehouseinfo, _ := service.GetTotalCountByGoodId(item.GoodId, item.StorehouseId)
+
+				//无库存
+				if warehouseinfo.StockCount <= 0 {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "5",
+					})
+					return
+				}
+
+				//有库存,进行出库,调用出库接口
+				if warehouseinfo.StockCount > 0 {
+					var total int64
+					var stock_cout int64
+					var total_count int64
+					//计算和最后一次出库数据的差
+					total = item.Count - lastGood.Count
+
+					if total > warehouseinfo.StockCount {
+						c.ServeSuccessJSON(map[string]interface{}{
+							"msg": "6",
+						})
+						return
+					}
+					//获取该耗材该批次的剩余库存量
+					info, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
+
+					//判断该批次的剩余库存 和出库的库存进行比较
+					//如果出库的库存大于该批次的剩余库存,那么需要出库下一批次的库存
+
+					if total > info.StockCount {
+						//计算出库和该批次相差的库存
+						total_count = item.Count - info.StockCount
+						//清空本批次次库存
+						service.DeleteWarehouseInfo(item.WarehouseInfotId)
+						//调用出库逻辑
+						parseDateErr := service.ConsumablesDeliveryTwo(item.OrgId, item, total_count)
+						if parseDateErr != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+							return
+						}
+					}
+					//如果与上次比的库存小于或等于于该批次的剩余库存,那么需要该批次出库
+					if total <= info.StockCount {
+						stock_cout = lastGood.Count + total
+						fmt.Println(stock_cout)
+						//扣减库存
+						warehouse := models.WarehousingInfo{
+							StockCount: info.StockCount - total,
+						}
+						errs := service.UpdateWarehousingInfo(warehouse, info.ID)
+
+						warehouseOutInfo := &models.WarehouseOutInfo{
+							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+							WarehouseOutId:          id,
+							WarehouseInfotId:        item.WarehouseInfotId,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							Remark:                  item.Remark,
+							OrgId:                   item.OrgId,
+							Type:                    1,
+							Manufacturer:            item.Manufacturer,
+							Dealer:                  item.Dealer,
+							IsSys:                   0,
+							SysRecordTime:           item.SysRecordTime,
+							GoodTypeId:              item.GoodTypeId,
+							GoodId:                  item.GoodId,
+							ExpiryDate:              item.ExpiryDate,
+							ProductDate:             item.ProductDate,
+							Number:                  item.Number,
+							Price:                   item.Price,
+							LicenseNumber:           item.LicenseNumber,
+							Count:                   item.Count,
+							ConsumableType:          2,
+							StorehouseId:            item.StorehouseId,
+							AdminUserId:             item.AdminUserId,
+							StockCount:              item.StockCount,
+							RegisterNumber:          item.RegisterNumber,
+						}
+
+						//查询是否存在
+						_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
+						if errcode == gorm.ErrRecordNotFound {
+
+							errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+							if errOne != nil {
+								utils.ErrorLog(errs.Error())
+								c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+								return
+							}
+						} else if errcode == nil {
+							service.UpDateWarehouseOutInfo(item)
+							//更新流水
+							flow := models.VmStockFlow{
+								Number:         item.Number,
+								LicenseNumber:  item.LicenseNumber,
+								Count:          item.Count,
+								Manufacturer:   item.Manufacturer,
+								Dealer:         item.Dealer,
+								ProductDate:    item.ProductDate,
+								ExpireDate:     item.ExpiryDate,
+								Price:          item.Price,
+								StorehouseId:   item.StorehouseId,
+								AdminUserId:    item.AdminUserId,
+								StockCount:     item.StockCount,
+								RegisterNumber: item.RegisterNumber,
+							}
+							service.UpdateStockFlowByDetailId(flow, item.ID)
+
+							goodInfo := models.GoodInfo{
+								Manufacturer: item.Manufacturer,
+								Dealer:       item.Dealer,
+							}
+							service.UpdatedGoodInfo(goodInfo, item.GoodId)
+						}
+					}
+				}
+			}
+
+			var last_count int64
+			var all_total int64
+			var stock_total int64
+			//如果退库数量小于最后一次批次的数量(要么要进行退库)
+			if item.Count < lastGood.Count {
+
+				//退库数量和最后一次出库数据进行计算
+				last_count = lastGood.Count - item.Count
+
+				//获取该耗材该批次的剩余库存量
+				infoInfo, _ := service.GetLastGoodCountById(item.GoodId, item.WarehouseInfotId)
+
+				//退库数量和最后一次出库数据进行计算的差 加上 剩余库存的数量与 该批次的入库数量进行比较
+				all_total = last_count + infoInfo.StockCount
+
+				//如果库存大于总数量，则退回到这个批次
+
+				if infoInfo.WarehousingCount > all_total {
+					stock_total = last_count + infoInfo.StockCount
+
+					//退回该批次,计算数量
+					warehousingInfoOne := models.WarehousingInfo{
+						StockCount:   stock_total,
+						ID:           item.WarehouseInfotId,
+						OrgId:        item.OrgId,
+						StorehouseId: item.StorehouseId,
+					}
+
+					parseDateErr := service.UpdateWarehousingInfo(warehousingInfoOne, item.WarehouseInfotId)
+
+					fmt.Println("parseDateErr", parseDateErr)
+					//插入一条新纪录
+					warehouseOutInfoThree := &models.WarehouseOutInfo{
+						WarehouseOutOrderNumber: item.WarehouseOutOrderNumber,
+						WarehouseOutId:          id,
+						WarehouseInfotId:        item.WarehouseInfotId,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Remark:                  item.Remark,
+						OrgId:                   item.OrgId,
+						Type:                    1,
+						Manufacturer:            item.Manufacturer,
+						Dealer:                  item.Dealer,
+						IsSys:                   0,
+						GoodTypeId:              item.GoodTypeId,
+						GoodId:                  item.GoodId,
+						ExpiryDate:              item.ExpiryDate,
+						ProductDate:             item.ProductDate,
+						Number:                  item.Number,
+						Price:                   item.Price,
+						LicenseNumber:           item.LicenseNumber,
+						ConsumableType:          2,
+						Count:                   item.Count,
+						StorehouseId:            item.StorehouseId,
+						AdminUserId:             item.AdminUserId,
+						StockCount:              item.StockCount,
+						RegisterNumber:          item.RegisterNumber,
+					}
+					//查询是否存在
+					_, errcode := service.GetWarehouseOutInfoIsExist(item.ID)
+					if errcode == gorm.ErrRecordNotFound {
+						errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfoThree)
+						if errOne != nil {
+							utils.ErrorLog(errs.Error())
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+							return
+						}
+
+					} else if errcode == nil {
+						service.UpDateWarehouseOutInfo(item)
+						flow := models.VmStockFlow{
+							Number:         item.Number,
+							LicenseNumber:  item.LicenseNumber,
+							Count:          item.Count,
+							Manufacturer:   item.Manufacturer,
+							Dealer:         item.Dealer,
+							ProductDate:    item.ProductDate,
+							ExpireDate:     item.ExpiryDate,
+							Price:          item.Price,
+							StorehouseId:   item.StorehouseId,
+							AdminUserId:    item.AdminUserId,
+							StockCount:     item.StockCount,
+							RegisterNumber: item.RegisterNumber,
+						}
+						service.UpdateStockFlowByDetailId(flow, item.ID)
+						goodInfo := models.GoodInfo{
+							Manufacturer: item.Manufacturer,
+							Dealer:       item.Dealer,
+						}
+						service.UpdatedGoodInfo(goodInfo, item.GoodId)
+
+					}
+				}
+
+				//如果库存小于总数量，则报错提醒，该批次的退库数据大于入库数据了无法退库,则需要退库到另一个批次
+				if infoInfo.WarehousingCount < all_total {
+					c.ServeSuccessJSON(map[string]interface{}{
+						"msg": "6",
+					})
+					return
+				}
+			}
+
+			if item.Count == lastGood.Count {
+
+				errs = service.UpDateWarehouseOutInfo(item)
+				flow := models.VmStockFlow{
+					Number:         item.Number,
+					LicenseNumber:  item.LicenseNumber,
+					Count:          item.Count,
+					Manufacturer:   item.Manufacturer,
+					Dealer:         item.Dealer,
+					ProductDate:    item.ProductDate,
+					ExpireDate:     item.ExpiryDate,
+					Price:          item.Price,
+					StorehouseId:   item.StorehouseId,
+					AdminUserId:    item.AdminUserId,
+					BuyPrice:       item.BuyPrice,
+					StockCount:     item.StockCount,
+					RegisterNumber: item.RegisterNumber,
+				}
+				service.UpdateStockFlowByDetailId(flow, item.ID)
+				goodInfo := models.GoodInfo{
+					Manufacturer: item.Manufacturer,
+					Dealer:       item.Dealer,
+				}
+				service.UpdatedGoodInfo(goodInfo, item.GoodId)
+
+			}
+
+			//查询该机构默认仓库
+			storeConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
+			//查询剩余库存
+			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, adminUserInfo.CurrentOrgId)
+			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)
+
 		}
 	}
 

models/drug_stock.go

@@ -541,6 +541,27 @@ type DrugWarehouseInfoTwenty struct {
 	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	IsCheck                   int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	BaseDrugLib               BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+type DrugWarehouseOutTwenty struct {
+	ID                        int64                        `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutOrderNumber   string                       `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	OperationTime             int64                        `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	Creater                   int64                        `gorm:"column:creater" json:"creater" form:"creater"`
+	OrgId                     int64                        `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                  int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                    string                       `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64                        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64                        `gorm:"column:status" json:"status" form:"status"`
+	WarehouseOutTime          int64                        `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	Dealer                    int64                        `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64                        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                      int64                        `gorm:"column:type" json:"type" form:"type"`
+	IsSys                     int64                        `gorm:"column:is_sys" json:"is_sys" form:"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"`
+	DrugWarehouseOutInfoTenty []*DrugWarehouseOutInfoTenty `gorm:"ForeignKey:WarehouseOutId;AssociationForeignKey:ID"json:"xt_drug_warehouse_out_info" `
 }
 
 func (DrugWarehouseInfoTwenty) TableName() string {

models/his_charge_models.go

@@ -100,6 +100,7 @@ type HisChargeOrder struct {
 	MafPay             float64               `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
 	FundPaySumamt      float64               `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
 	AcctPay            float64               `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay         float64               `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
 	HisChargeOrderInfo []*HisChargeOrderInfo `gorm:"ForeignKey:OrderNumber;AssociationForeignKey:Number" json:"order_info"`
 }
 

models/patient_schedule_template_models.go

@@ -19,7 +19,7 @@ type PatientScheduleTemplateId struct {
 	OrgID      int64 `gorm:"column:org_id" json:"-" form:"org_id"`
 	Status     int8  `gorm:"column:status" json:"-" form:"status"`
 	CreateTime int64 `gorm:"column:ctime" json:"-" form:"ctime"`
-	ModifyTime int64 `gorm:"column:mtime" json:"-" form:"mtime"`
+	ModifyTime int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
 }
 
 func (PatientScheduleTemplateId) TableName() string {

models/self_drug_models.go

@@ -647,6 +647,7 @@ type StDrugWarehouseInfo struct {
 	LastPrice        string  `json:"last_price"`
 	PackingUnit      string  `json:"packing_unit"`
 	Dosage           int64   `json:"dosage"`
+	LimaxUnit        string  `json:"limax_unit"`
 }
 
 type VmDrugWarehouseOutInfo struct {

models/stock_models.go

@@ -265,6 +265,7 @@ type WarehouseOutInfo struct {
 	StockCount              string       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	RegisterNumber          string       `gorm:"column:register_number" json:"register_number" form:"register_number"`
+
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -517,6 +518,7 @@ type WarehouseOutInfoOne struct {
 	AdminUserId                 int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	BuyPrice                    float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StockCount                  string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 type WarehouseOutInfoTwo struct {

service/device_service.go

@@ -261,6 +261,15 @@ func GetAllValidDeviceZones(orgID int64) ([]*models.DeviceZone, error) {
 	return zones, nil
 }
 
+func GetAllValidDeviceZonesOne(orgID int64) ([]*models.DeviceZone, error) {
+	var zones []*models.DeviceZone
+	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ? and status = 1", orgID).Find(&zones).Error
+	if err != nil {
+		return nil, err
+	}
+	return zones, nil
+}
+
 func GetDeviceZoneByID(orgID int64, zoneID int64) (*models.DeviceZone, error) {
 	var zone models.DeviceZone
 	err := readDb.Model(&models.DeviceZone{}).Where("org_id = ? AND id = ?", orgID, zoneID).First(&zone).Error

service/his_summary_service.go

@@ -9,7 +9,7 @@ import (
 func GetHisSummaryDetailList(keyword string, item_type int64, patient_id int64, org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
 
 	err = XTReadDB().Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 and orders.patient_id = ?", start_time, end_time, org_id, patient_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
+		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id,psn_cash_pay,acct_pay,fund_pay_sumamt").
 			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
 				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("status = 1").
 					Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
@@ -352,3 +352,72 @@ func GetAllHisOrderList(org_id int64, patient_id int64, start_time int64, end_ti
 
 	return order, err
 }
+
+func GetHisOrderListByMedChrgitemType(patient_id int64, startime int64, endtime int64, orgid int64) (info []*models.HisOrderInfoTwenty, err error) {
+
+	db := XTReadDB().Model(&models.HisOrderInfoTwenty{}).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if startime > 0 {
+		db = db.Where("settle_accounts_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("settle_accounts_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Group("med_chrgitm_type").Preload("Patients", "status = 1").Preload("HisHospitalCheckRecordTwenty", "status = 1").Find(&info).Error
+	return info, err
+}
+
+func GetOrderInfoList(patient_id int64, startime int64, endtime int64, orgid int64) (info []*models.HisOrderInfoTwenty, err error) {
+	db := XTReadDB().Model(&models.HisOrderInfoTwenty{}).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if startime > 0 {
+		db = db.Where("upload_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("upload_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Preload("HisOrderTenty", "status = 1").Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1")
+	}).Preload("HisDoctorAdvice", "status = 1").Preload("Patients", "status = 1").Preload("HisHospitalCheckRecordTwenty", "status = 1").Find(&info).Error
+	return info, err
+}
+
+func GetHisOrderListTwenty(patient_id int64, startime int64, endtime int64, orgid int64) (info []*models.HisOrderTenty, err error) {
+
+	db := XTReadDB().Model(&models.HisOrderTenty{}).Where("status = 1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if startime > 0 {
+		db = db.Where("settle_accounts_date>=?", startime)
+	}
+
+	if endtime > 0 {
+		db = db.Where("settle_accounts_date<=?", endtime)
+	}
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = db.Preload("HisOrderInfoTwenty", "status=1").Preload("Patients", "status = 1").Preload("HisHospitalCheckRecordTwenty", "status=1").Order("settle_accounts_date asc").Find(&info).Error
+	return info, err
+}
+
+func GetHisAdviceOrderList() {
+
+}

service/stock_service.go

@@ -730,6 +730,13 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 }
 
 func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64, warhouse_out_id int64) (models.DrugAutomaticReduceDetail, error) {
+//func CreateDrugFlowOneTX(flow models.DrugFlow,tx *gorm.DB) error {
+//	err := tx.Create(&flow).Error
+//	return err
+//}
+
+func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64) (models.DrugAutomaticReduceDetail, error) {
+
 	detail := models.DrugAutomaticReduceDetail{}
 	err := XTWriteDB().Model(&detail).Where("patient_id = ? and record_time = ? and drug_id = ? and status= 1 and advice_id =? ", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =? and id = ?", patientid, recorddate, drugid, advice_id, id).Updates(map[string]interface{}{"status": 0}).Error
@@ -1161,7 +1168,7 @@ func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.S
 	if org_id > 0 {
 		db = db.Where("x.org_id = ?", org_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,x.manufacturer,x.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
+	err = db.Select("x.id,x.max_unit as limax_unit,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,x.manufacturer,x.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
 	return list, err
 }
 
@@ -1303,9 +1310,13 @@ func FindAllCancelStockTotal(org_id int64) (total int64, err error) {
 func FindAllDrugCancelStockTotal(org_id int64) (total int64, err error) {
 	err = readDb.Model(&models.DrugCancelStock{}).Where("org_id = ?", org_id).Count(&total).Error
 	return total, err
-
 }
 
+//func FindAllDrugCancelStockTotalTX(org_id int64,tx *gorm.DB) (total int64, err error) {
+//	err = tx.Model(&models.DrugCancelStock{}).Where("org_id = ?", org_id).Count(&total).Error
+//	return total, err
+//}
+
 func FindAllReturnList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (list []*models.SalesReturn, total int64, err error) {
 	db := readDb.Model(&models.SalesReturn{})
 	db = db.Where("xt_sales_return.org_id = ? AND xt_sales_return.status = 1 AND xt_sales_return.type = ?", orgId, types)
@@ -1827,6 +1838,12 @@ func GetLastDrugCancelStockById(orgid int64) (models.DrugCancelStock, error) {
 	return stock, err
 }
 
+//func GetLastDrugCancelStockByIdTX(orgid int64,tx *gorm.DB) (models.DrugCancelStock, error) {
+//	stock := models.DrugCancelStock{}
+//	err := tx.Where("org_id = ? and status = 1", orgid).Last(&stock).Error
+//	return stock, err
+//}
+
 func GetManufactureById(id int64) (models.Manufacturer, error) {
 	manufacturer := models.Manufacturer{}
 	err := XTReadDB().Model(&manufacturer).Where("id = ? and status = 1", id).Find(&manufacturer).Error
@@ -1842,9 +1859,13 @@ func GetDealerById(id int64) (models.Dealer, error) {
 func AddSigleDrugCancelStock(cancelStock *models.DrugCancelStock) error {
 	err := writeDb.Create(&cancelStock).Error
 	return err
-
 }
 
+//func AddSigleDrugCancelStockTX(cancelStock *models.DrugCancelStock,tx *gorm.DB) error {
+//	err := tx.Create(&cancelStock).Error
+//	return err
+//}
+
 func CreateCancelStockInfo(cancelStockInfo []*models.CancelStockInfo) (err error) {
 	if len(cancelStockInfo) > 0 {
 		utx := writeDb.Begin()
@@ -1894,6 +1915,11 @@ func CreateCancelStockInfoTwo(info *models.DrugCancelStockInfo) error {
 	return err
 }
 
+//func CreateCancelStockInfoTwoTX(info *models.DrugCancelStockInfo,tx *gorm.DB) error {
+//	err := tx.Create(&info).Error
+//	return err
+//}
+
 func GetLastStockInfoThree(drugid int64) (models.DrugCancelStockInfo, error) {
 
 	info := models.DrugCancelStockInfo{}
@@ -1902,6 +1928,12 @@ func GetLastStockInfoThree(drugid int64) (models.DrugCancelStockInfo, error) {
 	return info, err
 }
 
+//func GetLastStockInfoThreeTX(drugid int64,tx *gorm.DB) (models.DrugCancelStockInfo, error) {
+//	info := models.DrugCancelStockInfo{}
+//	err := tx.Model(&info).Where("drug_id = ? and status = 1", drugid).Find(&info).Error
+//	return info, err
+//}
+
 func CreateCancelStockInfoOne(info *models.CancelStockInfo) error {
 
 	err := XTWriteDB().Create(&info).Error
@@ -3516,11 +3548,22 @@ func GetAllManufacturerList(orgid int64) (list []*models.Manufacturer, err error
 	return list, err
 }
 
+//func GetAllManufacturerListTX(orgid int64,tx *gorm.DB) (list []*models.Manufacturer, err error) {
+//
+//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//	return list, err
+//}
+
 func GetAllDealerList(orgid int64) (list []*models.Dealer, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&list).Error
 	return list, err
 }
+
+//func GetAllDealerListTX(orgid int64,tx *gorm.DB) (list []*models.Dealer, err error) {
+//	err = tx.Where("org_id = ? and status = 1", orgid).Find(&list).Error
+//	return list, err
+//}
 func GetDealerByName(orgid int64, name string) (*models.Dealer, error) {
 	var dealer models.Dealer
 	var err error
@@ -4113,7 +4156,7 @@ func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutI
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.supply_cancel_out_id,x.supply_warehouse_id,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.supply_cancel_out_id,x.supply_warehouse_id,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.register_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id,x.warehouse_info_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -4146,6 +4189,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 	}
 
 	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,x.register_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -5130,6 +5174,16 @@ func GetDrugWarehouseInfo(id int64) (models.XtDrugWarehouseInfo, error) {
 	return info, err
 }
 
+//func GetDrugWarehouseInfoTX(id int64,tx *gorm.DB) (models.XtDrugWarehouseInfo, error) {
+//	info := models.XtDrugWarehouseInfo{}
+//	db := tx.Model(&info).Where("status = 1")
+//	if id > 0 {
+//		db = db.Where("id = ?", id)
+//	}
+//	err := db.Select("drug_id,warehousing_count,stock_max_number,stock_min_number").Find(&info).Error
+//	return info, err
+//}
+
 func GetDrugWarehouseInfoPrescription(drugid int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and org_id =? and status = 1", drugid, orgid).Find(&info).Error
@@ -5222,6 +5276,11 @@ func UpdateDrugWarehouseInfo(info *models.XtDrugWarehouseInfo, id int64) error {
 	return err
 }
 
+//func UpdateDrugWarehouseInfoTX(info *models.XtDrugWarehouseInfo, id int64,tx *gorm.DB) error {
+//	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", info.StockMaxNumber)).Error
+//	return err
+//}
+
 func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) error {
 
 	//err := XTWriteDB().Model(&info).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"stock_min_number": info.StockMaxNumber}).Error
@@ -5231,6 +5290,11 @@ func UpdateDrugWarehouseInfoOne(info *models.XtDrugWarehouseInfo, id int64) erro
 	return err
 }
 
+//func UpdateDrugWarehouseInfoOneTX(info *models.XtDrugWarehouseInfo, id int64,tx *gorm.DB) error {
+//	err = tx.Model(&models.XtDrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
+//	return err
+//}
+
 func GetLastCancelStockInfo(id int64) (models.DrugCancelStockInfo, error) {
 
 	info := models.DrugCancelStockInfo{}
@@ -5399,6 +5463,12 @@ func UpdateDrugCancel(id int64) (models.DrugCancelStock, error) {
 	return stock, err
 }
 
+//func UpdateDrugCancelTX(id int64,tx *gorm.DB) (models.DrugCancelStock, error) {
+//	stock := models.DrugCancelStock{}
+//	err := tx.Model(&stock).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
+//	return stock, err
+//}
+
 func GetDrugWarehouseOutInfo(warehouse_info_id int64, drug_id int64) (info []*models.DrugWarehouseOutInfo, err error) {
 
 	db := XTReadDB().Model(&info)
@@ -5413,12 +5483,29 @@ func GetDrugWarehouseOutInfo(warehouse_info_id int64, drug_id int64) (info []*mo
 	return info, err
 }
 
+//func GetDrugWarehouseOutInfoTX(warehouse_info_id int64, drug_id int64,tx *gorm.DB) (info []*models.DrugWarehouseOutInfo, err error) {
+//	db := tx.Model(&info)
+//	if warehouse_info_id > 0 {
+//		db = db.Where("warehouse_info_id = ?", warehouse_info_id)
+//	}
+//	if drug_id > 0 {
+//		db = db.Where("drug_id = ? and status =1", drug_id)
+//	}
+//	err = db.Find(&info).Error
+//	return info, err
+//}
+
 func GetCancelDrugStockOutInfo(warehouse_info_id int64, drug_id int64) (info []*models.DrugCancelStockInfo, err error) {
 
 	err = XTReadDB().Model(&info).Where("batch_number_id =? and drug_id = ? and status = 1", warehouse_info_id, drug_id).Find(&info).Error
 	return info, err
 }
 
+//func GetCancelDrugStockOutInfoTX(warehouse_info_id int64, drug_id int64,tx *gorm.DB) (info []*models.DrugCancelStockInfo, err error) {
+//	err = tx.Model(&info).Where("batch_number_id =? and drug_id = ? and status = 1", warehouse_info_id, drug_id).Find(&info).Error
+//	return info, err
+//}
+
 func GetTemplateSummary(orgid int64) (config []*models.Dataconfig, err error) {
 
 	err = XTReadDB().Model(&config).Where("module='template_summary' and parent_id=? and org_id in (?)", 0, orgid).Find(&config).Error
@@ -5954,7 +6041,7 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber}).Error
 	return err
 }
 
@@ -5966,12 +6053,12 @@ func UpdatedStockFlowByGoodId(warehousing_id int64, good_id int64, flow models.V
 
 func UpdatedStockFlowByGoodIdOne(warehousing_id int64, good_id int64, flow models.VmStockFlow) error {
 
-	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber, "storehouse_id": flow.StorehouseId}).Error
+	err := XTWriteDB().Model(&flow).Where("warehousing_id = ? and good_id = ? and status = 1", warehousing_id, good_id).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber, "storehouse_id": flow.StorehouseId, "register_number": flow.RegisterNumber}).Error
 	return err
 }
 
 func UpdateStockFlowByDetailId(flow models.VmStockFlow, wareoutdetailid int64) error {
-	err := XTWriteDB().Model(&flow).Where("warehouse_out_detail_id = ? and status = 1", wareoutdetailid).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber, "price": flow.Price, "storehouse_id": flow.StorehouseId, "admin_user_id": flow.AdminUserId, "stock_count": flow.StockCount}).Error
+	err := XTWriteDB().Model(&flow).Where("warehouse_out_detail_id = ? and status = 1", wareoutdetailid).Updates(map[string]interface{}{"count": flow.Count, "number": flow.Number, "product_date": flow.ProductDate, "expire_date": flow.ExpireDate, "Price": flow.Price, "manufacturer": flow.Manufacturer, "dealer": flow.Dealer, "license_number": flow.LicenseNumber, "price": flow.Price, "storehouse_id": flow.StorehouseId, "admin_user_id": flow.AdminUserId, "stock_count": flow.StockCount, "register_number": flow.RegisterNumber}).Error
 	return err
 }
 
@@ -6457,6 +6544,11 @@ func UpdateMedicalSumCount(drug_id int64, sum_count int64, sum_in_count int64, o
 	return err
 }
 
+//func UpdateMedicalSumCountTX(drug_id int64, sum_count int64, sum_in_count int64, orgid int64,tx *gorm.DB) error {
+//	err := tx.Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drug_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
+//	return err
+//}
+
 func UpdateGoodByGoodId(good_id int64, sum_count int64, sum_in_count int64, orgid int64) error {
 	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", good_id, orgid).Update(map[string]interface{}{"sum_count": sum_count, "sum_in_count": sum_in_count}).Error
 	return err

service/user_service.go

@@ -25,12 +25,13 @@ type AdminUserList struct {
 	Id       int64  `json:"id"`
 	Name     string `json:"name"`
 	UserType int64  `json:"user_type"`
+	Status   int64  `json:"status"`
 }
 
 func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
 
 	var users []AdminUserList
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and org_id=? and app_id =? and uar.user_type IN (2,3) and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&users).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and org_id=? and app_id =? and uar.user_type IN (2,3) and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&users).Error
 	if err != nil {
 		return
 	}
@@ -49,14 +50,14 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }
 
 func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
 
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 	//err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1  and ua.status=1").Select("ua.id, uar.user_name as name, uar.user_type").Scan(&list).Error
 	return
 }
@@ -64,7 +65,7 @@ func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
 func GetAdminUser(orgId, appid, id int64) (*AdminUserList, error) {
 	var err error
 	var user AdminUserList
-	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and uar.admin_user_id = ? and ua.status=1", orgId, appid, id).Select("ua.id, uar.user_name as name, uar.user_type").Order("uar.id ASC").Take(&user).Error
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=? and uar.app_id =? and uar.admin_user_id = ? and ua.status=1", orgId, appid, id).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Order("uar.id ASC").Take(&user).Error
 
 	if err == gorm.ErrRecordNotFound {
 		return nil, nil

service/warhouse_service.go

@@ -274,6 +274,9 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
 
 			}
 
@@ -286,6 +289,12 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -530,9 +539,13 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	prescribingNumber_temp := strconv.FormatFloat(math.Abs(prescribingNumber), 'f', 0, 64)
 	count, _ := strconv.ParseInt(prescribingNumber_temp, 10, 64)
 
-	if advice.PrescribingNumberUnit == drup.MaxUnit {
+	if advice.PrescribingNumberUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
 		deliver_number = count * drup.MinNumber
-	} else {
+	}
+	if advice.PrescribingNumberUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+		deliver_number = count * drup.MinNumber
+	}
+	if advice.PrescribingNumberUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
 		deliver_number = count
 	}
 
@@ -570,12 +583,10 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
-
 		return err
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
-
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 	fmt.Println("查询剩余库存", stock_number)
 
@@ -670,6 +681,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		// 判断处方里药品单位是拆零单位还是包装单位,	如果是拆零单位，则根据规格，将拆零数量转为包装数量
 		var maxNumber int64 = 0
 		var minNumber int64 = 0
+		//var stock_max_number int64 = 0
+		//
+		//stock_max_number = warehouse.StockMaxNumber
 
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
@@ -683,9 +697,12 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				return errors.New("库存数量不足")
 			}
 		}
+		fmt.Println("max_number23323232323232232323", maxNumber)
+		fmt.Println("minNumber", minNumber)
 		fmt.Println("查询库存", warehouse.StockMaxNumber)
 		fmt.Println("扣减库存我的", maxNumber)
 		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		fmt.Println("max_number23323232323232232323", warehouse.StockMaxNumber)
 		fmt.Println("剩余库存我的", warehouse.StockMaxNumber)
 
 		if warehouse.StockMaxNumber < 0 {
@@ -698,20 +715,25 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		warehouse.Mtime = time.Now().Unix()
 
 		if warehouse.StockMinNumber < minNumber {
-
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
-
 			if minNumber > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 			}
 
+			fmt.Println("deliver_number2332322323323232", deliver_number)
+
+			fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
 			if minNumber == 0 && maxNumber != 1 {
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
 
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 		}
 
@@ -727,6 +749,12 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				//if warehouse.StockMinNumber == 0 {
+				//	 warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -739,6 +767,10 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		if warehouse.StockMinNumber <= 0 {
 			warehouse.StockMinNumber = 0
 		}
+
+		fmt.Println("warehouse.StockMinNumber 2323323232233", warehouse.StockMinNumber)
+		fmt.Println("warehouse.StockMaxNumber 2323323232233", warehouse.StockMaxNumber)
+
 		fmt.Println("stock_max_233232323223323233223323223", warehouse.StockMinNumber)
 		fmt.Println("stock_max_233232323223323233223323223", warehouse.StockMaxNumber)
 		//扣减库存232332332332
@@ -1903,6 +1935,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
@@ -1946,6 +1979,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 
 		//创建出库流水
@@ -2013,6 +2047,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -2065,6 +2100,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			RegisterNumber:          goods.RegisterNumber,
 		}
 
 		//创建出库明细
@@ -2419,6 +2455,9 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
 
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
 			}
 		}
 
@@ -2429,6 +2468,12 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -2786,6 +2831,10 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
 
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 		}
 
@@ -2796,6 +2845,12 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -4542,7 +4597,10 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 		} else {
 			if minNumber > 0 {
 				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					if (warehouse.StockMinNumber - deliver_number) > 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
 				} else {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
@@ -4552,6 +4610,9 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
 
 			}
 
@@ -4564,6 +4625,12 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}
@@ -4786,6 +4853,11 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		warehouseOutInfo.Count = prescribingNumber
 		warehouseOutInfo.CountUnit = advice.CountUnit
 
+		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
+
 		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
 			WarehouseOutId:          warehouseout.ID,
@@ -4858,7 +4930,10 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 		} else {
 			if minNumber > 0 {
 				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					if (warehouse.StockMinNumber - deliver_number) > 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
 				} else {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
 				}
@@ -4868,11 +4943,21 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 				if warehouse.StockMinNumber > 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				}
+				if (warehouse.StockMinNumber - deliver_number) > 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
 
 			}
 
 		}
 
+		}
+
+		fmt.Println("maxNumber2332323233223", maxNumber)
+		fmt.Println("minNumber", minNumber)
+		fmt.Println("warehouse.StockMinNumber2332322323", warehouse.StockMinNumber)
+		fmt.Println("deliver_number233232323233223332", deliver_number)
+
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) > 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
@@ -4880,6 +4965,12 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 				//if warehouse.StockMinNumber == 0 {
 				//  warehouse.StockMaxNumber = stock_max_number
 				//}
+			if (warehouse.StockMinNumber - deliver_number) > 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+
+				//if warehouse.StockMinNumber == 0 {
+				//	warehouse.StockMaxNumber = stock_max_number
+				//}
 			}
 
 		}