11月9日库存管理

controllers/dialysis_api_controller.go

@@ -3764,7 +3764,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.CurrentOrgId == 10395 {
+			if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -3792,7 +3792,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
-	if adminInfo.CurrentOrgId == 10395 {
+	if adminInfo.CurrentOrgId == 10395 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate / 1000)
@@ -4358,33 +4358,43 @@ func (this *DialysisApiController) SaveDialysisSetting() {
 	bicarbonate_set, _ := this.GetInt64("bicarbonate_set")
 	glucose_set, _ := this.GetInt64("glucose_set")
 
+	sodium_set, _ := this.GetInt64("sodium_set")
+	calcium_set, _ := this.GetInt64("calcium_set")
+	blood_access_set, _ := this.GetInt64("blood_access_set")
+	dialyzer_perfusion_apparatus_set, _ := this.GetInt64("dialyzer_perfusion_apparatus_set")
+	displace_liqui_part_set, _ := this.GetInt64("displace_liqui_part_set")
 	dialysisSetting := models.XtDialysisSetting{
-		UserOrgId:             orgId,
-		Status:                1,
-		DeviceNumber:          device_number_set,
-		DeviceType:            device_type_set,
-		Name:                  name_set,
-		AdmissionNumber:       admission_number_set,
-		DialysisNo:            dialysis_no_set,
-		WeightBefor:           weight_befor_set,
-		DryWeight:             dry_weight_set,
-		BloodPressure:         blood_pressure_set,
-		UltrafiltrationVolume: ultrafiltration_volume_set,
-		InternalFistula:       internal_fistula_set,
-		BloodFlowVolume:       blood_flow_volume_set,
-		Anticoagulant:         anticoagulant_set,
-		SealingFluidDispose:   sealing_fluid_dispose_set,
-		ModeId:                mode_id_set,
-		DialysisTime:          dialysis_time_set,
-		DialysisDialyszers:    dialysis_dialyszers_set,
-		DialysisIrrigation:    dialysis_irrigation_set,
-		Gaijiliang:            gaijiliang_set,
-		Kalium:                kalium_set,
-		DisplaceLiquiValue:    displace_liqui_value_set,
-		Bicarbonate:           bicarbonate_set,
-		Glucose:               glucose_set,
-		Ctime:                 time.Now().Unix(),
-		Mtime:                 time.Now().Unix(),
+		Sodium:                     sodium_set,
+		Calcium:                    calcium_set,
+		BloodAccess:                blood_access_set,
+		DialyzerPerfusionApparatus: dialyzer_perfusion_apparatus_set,
+		DisplaceLiquiPart:          displace_liqui_part_set,
+		UserOrgId:                  orgId,
+		Status:                     1,
+		DeviceNumber:               device_number_set,
+		DeviceType:                 device_type_set,
+		Name:                       name_set,
+		AdmissionNumber:            admission_number_set,
+		DialysisNo:                 dialysis_no_set,
+		WeightBefor:                weight_befor_set,
+		DryWeight:                  dry_weight_set,
+		BloodPressure:              blood_pressure_set,
+		UltrafiltrationVolume:      ultrafiltration_volume_set,
+		InternalFistula:            internal_fistula_set,
+		BloodFlowVolume:            blood_flow_volume_set,
+		Anticoagulant:              anticoagulant_set,
+		SealingFluidDispose:        sealing_fluid_dispose_set,
+		ModeId:                     mode_id_set,
+		DialysisTime:               dialysis_time_set,
+		DialysisDialyszers:         dialysis_dialyszers_set,
+		DialysisIrrigation:         dialysis_irrigation_set,
+		Gaijiliang:                 gaijiliang_set,
+		Kalium:                     kalium_set,
+		DisplaceLiquiValue:         displace_liqui_value_set,
+		Bicarbonate:                bicarbonate_set,
+		Glucose:                    glucose_set,
+		Ctime:                      time.Now().Unix(),
+		Mtime:                      time.Now().Unix(),
 	}
 	err := service.SaveDialysisSetting(dialysisSetting)
 	if err == nil {
@@ -4430,10 +4440,12 @@ func (this *DialysisApiController) GetDialysisParameterList() {
 
 	list, total, err := service.GetDialysisParameterList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
 
+	dialysisSett, _ := service.GetDialysisSetting(orgId)
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
-			"list":  list,
-			"total": total,
+			"list":         list,
+			"total":        total,
+			"dialysisSett": dialysisSett,
 		})
 		return
 

controllers/drug_stock_api_contorller.go

@@ -3759,6 +3759,7 @@ func (c *StockDrugApiController) CheckDrugOut() {
 	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
 	for _, it := range warehousingOutInfoList {
+		fmt.Println("countunit23322332232323wo", it.CountUnit)
 		var total_count int64
 		var out_count int64
 		//查询剩余库存
@@ -3800,27 +3801,17 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			return
 		}
 	}
-	for _, it := range warehousingOutInfoList {
-
-		drup, _ := service.FindBaseDrugLibRecord(it.OrgId, it.DrugId)
-		//出库逻辑
-		service.AutoDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it)
+	warehousingOutInfoListTwo, _ := service.GetDrugWarehouseOutListById(warehouse_out_id, orgId)
 
+	for _, it := range warehousingOutInfoListTwo {
 		medical, _ := service.GetBaseDrugMedical(it.DrugId)
-		//查询剩余库存
-		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
-		var sum_count int64
-		for _, its := range stockInfo {
-			if its.MaxUnit == medical.MaxUnit {
-				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-			}
-			sum_count += its.StockMaxNumber + its.StockMinNumber
-		}
-		//更新基础库库存
-		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count, it.OrgId)
-
 		////出库数量累加
 		var out_count_one int64
+		fmt.Println("it.count", it.CountUnit)
+		fmt.Println("MaxUnit", medical.MaxUnit)
+		fmt.Println("MinUnit", medical.MinUnit)
+		fmt.Println("count", it.Count)
+		fmt.Println("number", medical.MinNumber)
 		if it.CountUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
 			out_count_one = it.Count * medical.MinNumber
 		}
@@ -3829,21 +3820,43 @@ func (c *StockDrugApiController) CheckDrugOut() {
 			out_count_one = it.Count
 		}
 
-		if it.CountUnit == medical.MinUnit && medical.MaxUnit == medical.MinUnit {
+		if it.CountUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
 			out_count_one = it.Count
 		}
-
+		fmt.Println("countone3232232323323232332332wo", out_count_one)
 		//增加出库数量
 		service.AddDrugCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, out_count_one)
+		fmt.Println("countunit23322332232323", it.CountUnit)
 
-		//查询该药品剩余库存
-		infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut)
-		var over_count int64
-		for _, its := range infolist {
-			over_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+	}
+	warehousingOutInfoListThree, _ := service.GetDrugWarehouseOutListById(warehouse_out_id, orgId)
+	for _, it := range warehousingOutInfoListThree {
+		medical, _ := service.GetBaseDrugMedical(it.DrugId)
+		drup, _ := service.FindBaseDrugLibRecord(it.OrgId, it.DrugId)
+		//出库逻辑
+		service.AutoDrugDeliverInfoFourtyOne(orgId, it.Count, &drugWarehouseOut, &drup, it)
+
+		//查询剩余库存
+		stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, it.OrgId, it.DrugId)
+		var sum_count int64
+		for _, its := range stockInfo {
+			if its.MaxUnit == medical.MaxUnit {
+				its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+			}
+			sum_count += its.StockMaxNumber + its.StockMinNumber
 		}
+		//更新基础库库存
+		service.UpdateBaseDrugSumTwo(it.DrugId, sum_count, it.OrgId)
+
+		//查询该药品剩余库存
+		//infolist, _ := service.FindDrugWarehouseInfoFlushCountByStorehouse(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut)
+		//var over_count int64
+		//for _, its := range infolist {
+		//  over_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+		//}
 		//更新剩余库存
-		service.UpdateDrugStockCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, over_count)
+		service.UpdateDrugStockCount(it.DrugId, it.OrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+
 	}
 
 	out := models.DrugWarehouseOut{

controllers/his_api_controller.go

@@ -1109,7 +1109,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												return
 											}
 
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
+											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
 												if prescribing_number > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -1126,7 +1126,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
 											}
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
+											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
 												if num > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -1195,7 +1195,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
+													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -1213,7 +1213,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 || adminInfo.CurrentOrgId == 9671 {
+														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
@@ -2563,89 +2563,164 @@ func (c *HisApiController) DeletePrescription() {
 					manufacturer, _ := service.GetManufactureById(info.Manufacturer)
 					deaerler, _ := service.GetDealerById(info.Dealer)
 
-					//查询今日该患者开了多少耗材
-					//projectList, _ := service.GetHisPrepscritionByPatientId(info.PatientId, item.ProjectId, info.SysRecordTime)
-					//
 					var total_count int64
-					//var cha_count int64
-					//for _, item := range projectList {
-					//  count, _ := strconv.ParseInt(item.Count, 10, 64)
-					//  total_count += count
-					//}
 					count, _ := strconv.ParseInt(item.Count, 10, 64)
 					total_count += count
-					//回退库存
-					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, item.ProjectId)
+
 					goodList, _ := service.GetSumGoodList(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId)
 					var flush_count int64
 					for _, it := range goodList {
 						flush_count += it.StockCount
 					}
 					if info.ID > 0 {
-						cancelStockInfo := models.CancelStockInfo{
-							GoodId:          item.ProjectId,
-							CancelStockId:   cancel.ID,
-							GoodTypeId:      good.GoodTypeId,
-							Count:           prescribingNumber,
-							Price:           info.Price,
-							Total:           0,
-							ProductDate:     info.ProductDate,
-							ExpiryDate:      info.ExpiryDate,
-							Ctime:           time.Now().Unix(),
-							Status:          1,
-							OrgId:           c.GetAdminUserInfo().CurrentOrgId,
-							OrderNumber:     cancel.OrderNumber,
-							Type:            0,
-							Dealer:          deaerler.DealerName,
-							Manufacturer:    manufacturer.ManufacturerName,
-							Number:          info.Number,
-							RegisterAccount: "",
-							Remark:          "",
-							WarehouseInfoId: info.WarehouseInfotId,
-							PatientId:       info.PatientId,
-							RecordDate:      info.SysRecordTime,
-							StorehouseId:    houseConfig.StorehouseOutInfo,
-							IsCheck:         1,
+						if info.Count >= total_count {
+
+							//回退库存
+							service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, total_count, info.PatientId, info.SysRecordTime, item.ProjectId)
+							cancelStockInfo := models.CancelStockInfo{
+								GoodId:          item.ProjectId,
+								CancelStockId:   cancel.ID,
+								GoodTypeId:      good.GoodTypeId,
+								Count:           prescribingNumber,
+								Price:           info.Price,
+								Total:           0,
+								ProductDate:     info.ProductDate,
+								ExpiryDate:      info.ExpiryDate,
+								Ctime:           time.Now().Unix(),
+								Status:          1,
+								OrgId:           c.GetAdminUserInfo().CurrentOrgId,
+								OrderNumber:     cancel.OrderNumber,
+								Type:            0,
+								Dealer:          deaerler.DealerName,
+								Manufacturer:    manufacturer.ManufacturerName,
+								Number:          info.Number,
+								RegisterAccount: "",
+								Remark:          "",
+								WarehouseInfoId: info.WarehouseInfotId,
+								PatientId:       info.PatientId,
+								RecordDate:      info.SysRecordTime,
+								StorehouseId:    houseConfig.StorehouseOutInfo,
+								IsCheck:         1,
+							}
+
+							service.CreateCancelStockInfoOne(&cancelStockInfo)
+
+							cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
+
+							flow := models.VmStockFlow{
+								WarehousingId:           info.WarehouseInfotId,
+								GoodId:                  item.ProjectId,
+								Number:                  info.Number,
+								LicenseNumber:           info.LicenseNumber,
+								Count:                   prescribingNumber,
+								UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+								PatientId:               item.PatientId,
+								SystemTime:              info.SysRecordTime,
+								ConsumableType:          7,
+								IsSys:                   0,
+								WarehousingOrder:        "",
+								WarehouseOutId:          info.WarehouseOutId,
+								WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+								IsEdit:                  0,
+								CancelStockId:           cancel.ID,
+								CancelOrderNumber:       cancel.OrderNumber,
+								Manufacturer:            manufacturer.ID,
+								Dealer:                  0,
+								Creator:                 c.GetAdminUserInfo().CurrentOrgId,
+								UpdateCreator:           0,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   0,
+								Price:                   info.Price,
+								WarehousingDetailId:     info.WarehouseInfotId,
+								WarehouseOutDetailId:    info.ID,
+								CancelOutDetailId:       cancelInfo.ID,
+								ProductDate:             info.ProductDate,
+								ExpireDate:              info.ExpiryDate,
+								StorehouseId:            houseConfig.StorehouseOutInfo,
+								OverCount:               flush_count,
+							}
+							service.CreateStockFlowOne(flow)
+
+							//退库数量增加
+							service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
+							//出库数量减少
+							service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, total_count)
 						}
 
-						service.CreateCancelStockInfoOne(&cancelStockInfo)
-
-						cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
-
-						flow := models.VmStockFlow{
-							WarehousingId:           info.WarehouseInfotId,
-							GoodId:                  item.ProjectId,
-							Number:                  info.Number,
-							LicenseNumber:           info.LicenseNumber,
-							Count:                   prescribingNumber,
-							UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
-							PatientId:               item.PatientId,
-							SystemTime:              info.SysRecordTime,
-							ConsumableType:          7,
-							IsSys:                   0,
-							WarehousingOrder:        "",
-							WarehouseOutId:          info.WarehouseOutId,
-							WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-							IsEdit:                  0,
-							CancelStockId:           cancel.ID,
-							CancelOrderNumber:       cancel.OrderNumber,
-							Manufacturer:            manufacturer.ID,
-							Dealer:                  0,
-							Creator:                 c.GetAdminUserInfo().CurrentOrgId,
-							UpdateCreator:           0,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   0,
-							Price:                   info.Price,
-							WarehousingDetailId:     info.WarehouseInfotId,
-							WarehouseOutDetailId:    info.ID,
-							CancelOutDetailId:       cancelInfo.ID,
-							ProductDate:             info.ProductDate,
-							ExpireDate:              info.ExpiryDate,
-							StorehouseId:            houseConfig.StorehouseOutInfo,
-							OverCount:               flush_count,
+						if info.Count < total_count {
+							//回退库存
+							service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, item.ProjectId)
+							cancelStockInfo := models.CancelStockInfo{
+								GoodId:          item.ProjectId,
+								CancelStockId:   cancel.ID,
+								GoodTypeId:      good.GoodTypeId,
+								Count:           info.Count,
+								Price:           info.Price,
+								Total:           0,
+								ProductDate:     info.ProductDate,
+								ExpiryDate:      info.ExpiryDate,
+								Ctime:           time.Now().Unix(),
+								Status:          1,
+								OrgId:           c.GetAdminUserInfo().CurrentOrgId,
+								OrderNumber:     cancel.OrderNumber,
+								Type:            0,
+								Dealer:          deaerler.DealerName,
+								Manufacturer:    manufacturer.ManufacturerName,
+								Number:          info.Number,
+								RegisterAccount: "",
+								Remark:          "",
+								WarehouseInfoId: info.WarehouseInfotId,
+								PatientId:       info.PatientId,
+								RecordDate:      info.SysRecordTime,
+								StorehouseId:    houseConfig.StorehouseOutInfo,
+								IsCheck:         1,
+							}
+
+							service.CreateCancelStockInfoOne(&cancelStockInfo)
+
+							cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.ProjectId)
+
+							flow := models.VmStockFlow{
+								WarehousingId:           info.WarehouseInfotId,
+								GoodId:                  item.ProjectId,
+								Number:                  info.Number,
+								LicenseNumber:           info.LicenseNumber,
+								Count:                   info.Count,
+								UserOrgId:               c.GetAdminUserInfo().CurrentOrgId,
+								PatientId:               item.PatientId,
+								SystemTime:              info.SysRecordTime,
+								ConsumableType:          7,
+								IsSys:                   0,
+								WarehousingOrder:        "",
+								WarehouseOutId:          info.WarehouseOutId,
+								WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+								IsEdit:                  0,
+								CancelStockId:           cancel.ID,
+								CancelOrderNumber:       cancel.OrderNumber,
+								Manufacturer:            manufacturer.ID,
+								Dealer:                  0,
+								Creator:                 c.GetAdminUserInfo().CurrentOrgId,
+								UpdateCreator:           0,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								Mtime:                   0,
+								Price:                   info.Price,
+								WarehousingDetailId:     info.WarehouseInfotId,
+								WarehouseOutDetailId:    info.ID,
+								CancelOutDetailId:       cancelInfo.ID,
+								ProductDate:             info.ProductDate,
+								ExpireDate:              info.ExpiryDate,
+								StorehouseId:            houseConfig.StorehouseOutInfo,
+								OverCount:               flush_count,
+							}
+							service.CreateStockFlowOne(flow)
+
+							//退库数量增加
+							service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, info.Count)
+							//出库数量减少
+							service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, info.Count)
 						}
-						service.CreateStockFlowOne(flow)
 
 						//查询已出库数量
 						dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
@@ -2655,16 +2730,11 @@ func (c *HisApiController) DeletePrescription() {
 							service.UpdateAutoGood(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId, item.ID, prescribingNumber)
 						}
 
-						if prescribingNumber == dialysisInfo.Count {
+						if prescribingNumber >= dialysisInfo.Count {
 							//删除出库表
 							service.DeleteAutoRedeceDetailTen(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, item.ProjectId)
 						}
 
-						//退库数量增加
-						service.UpdateSumAddCancelCount(c.GetAdminUserInfo().CurrentOrgId, item.ProjectId, houseConfig.StorehouseOutInfo, total_count)
-						//出库数量减少
-						service.UpdateSumCount(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, total_count)
-
 						//更新库存
 						service.UpdateSumGood(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, flush_count)
 
@@ -2969,77 +3039,156 @@ func (c *HisApiController) DeleteProject() {
 			manufacturer, _ := service.GetManufactureById(info.Manufacturer)
 			deaerler, _ := service.GetDealerById(info.Dealer)
 			if info.ID > 0 {
-				cancelStockInfo := models.CancelStockInfo{
-					GoodId:          project.ProjectId,
-					CancelStockId:   cancel.ID,
-					GoodTypeId:      good.GoodTypeId,
-					Count:           prescribingNumber,
-					Price:           info.Price,
-					Total:           0,
-					ProductDate:     info.ProductDate,
-					ExpiryDate:      info.ExpiryDate,
-					Ctime:           time.Now().Unix(),
-					Status:          1,
-					OrgId:           adminInfo.CurrentOrgId,
-					OrderNumber:     cancel.OrderNumber,
-					Type:            0,
-					Dealer:          deaerler.DealerName,
-					Manufacturer:    manufacturer.ManufacturerName,
-					Number:          info.Number,
-					RegisterAccount: "",
-					Remark:          "",
-					WarehouseInfoId: info.WarehouseInfotId,
-					PatientId:       info.PatientId,
-					RecordDate:      info.SysRecordTime,
-					StorehouseId:    houseConfig.StorehouseOutInfo,
-					IsCheck:         1,
-				}
-
-				service.CreateCancelStockInfoOne(&cancelStockInfo)
-
 				cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(project.ProjectId)
+				if info.Count >= prescribingNumber {
+					cancelStockInfo := models.CancelStockInfo{
+						GoodId:          project.ProjectId,
+						CancelStockId:   cancel.ID,
+						GoodTypeId:      good.GoodTypeId,
+						Count:           prescribingNumber,
+						Price:           info.Price,
+						Total:           0,
+						ProductDate:     info.ProductDate,
+						ExpiryDate:      info.ExpiryDate,
+						Ctime:           time.Now().Unix(),
+						Status:          1,
+						OrgId:           adminInfo.CurrentOrgId,
+						OrderNumber:     cancel.OrderNumber,
+						Type:            0,
+						Dealer:          deaerler.DealerName,
+						Manufacturer:    manufacturer.ManufacturerName,
+						Number:          info.Number,
+						RegisterAccount: "",
+						Remark:          "",
+						WarehouseInfoId: info.WarehouseInfotId,
+						PatientId:       info.PatientId,
+						RecordDate:      info.SysRecordTime,
+						StorehouseId:    houseConfig.StorehouseOutInfo,
+						IsCheck:         1,
+					}
+
+					service.CreateCancelStockInfoOne(&cancelStockInfo)
+					//回退库存
+					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, prescribingNumber, info.PatientId, info.SysRecordTime, project.ProjectId)
+					//退库数量增加
+					service.UpdateSumAddCancelCount(adminInfo.CurrentOrgId, project.ProjectId, houseConfig.StorehouseOutInfo, prescribingNumber)
+					//出库数量减少
+					service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, prescribingNumber)
+				}
+				if info.Count < prescribingNumber {
+					cancelStockInfo := models.CancelStockInfo{
+						GoodId:          project.ProjectId,
+						CancelStockId:   cancel.ID,
+						GoodTypeId:      good.GoodTypeId,
+						Count:           info.Count,
+						Price:           info.Price,
+						Total:           0,
+						ProductDate:     info.ProductDate,
+						ExpiryDate:      info.ExpiryDate,
+						Ctime:           time.Now().Unix(),
+						Status:          1,
+						OrgId:           adminInfo.CurrentOrgId,
+						OrderNumber:     cancel.OrderNumber,
+						Type:            0,
+						Dealer:          deaerler.DealerName,
+						Manufacturer:    manufacturer.ManufacturerName,
+						Number:          info.Number,
+						RegisterAccount: "",
+						Remark:          "",
+						WarehouseInfoId: info.WarehouseInfotId,
+						PatientId:       info.PatientId,
+						RecordDate:      info.SysRecordTime,
+						StorehouseId:    houseConfig.StorehouseOutInfo,
+						IsCheck:         1,
+					}
+
+					service.CreateCancelStockInfoOne(&cancelStockInfo)
+					//回退库存
+					service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, info.Count, info.PatientId, info.SysRecordTime, project.ProjectId)
+					//退库数量增加
+					service.UpdateSumAddCancelCount(adminInfo.CurrentOrgId, project.ProjectId, houseConfig.StorehouseOutInfo, info.Count)
+					//出库数量减少
+					service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, info.Count)
+				}
 
-				//回退库存
-				service.UpDateWarehouseInfoByStockDelete(info.WarehouseInfotId, prescribingNumber, info.PatientId, info.SysRecordTime, project.ProjectId)
 				goodList, _ := service.GetSumGoodList(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId)
 				var over_count int64
 				for _, it := range goodList {
 					over_count += it.StockCount
 				}
-				flow := models.VmStockFlow{
-					WarehousingId:           info.WarehouseInfotId,
-					GoodId:                  project.ProjectId,
-					Number:                  info.Number,
-					LicenseNumber:           info.LicenseNumber,
-					Count:                   prescribingNumber,
-					UserOrgId:               adminInfo.CurrentOrgId,
-					PatientId:               project.PatientId,
-					SystemTime:              info.SysRecordTime,
-					ConsumableType:          7,
-					IsSys:                   0,
-					WarehousingOrder:        "",
-					WarehouseOutId:          info.WarehouseOutId,
-					WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-					IsEdit:                  0,
-					CancelStockId:           cancel.ID,
-					CancelOrderNumber:       cancel.OrderNumber,
-					Manufacturer:            manufacturer.ID,
-					Dealer:                  0,
-					Creator:                 adminInfo.AdminUser.Id,
-					UpdateCreator:           0,
-					Status:                  1,
-					Ctime:                   time.Now().Unix(),
-					Mtime:                   0,
-					Price:                   info.Price,
-					WarehousingDetailId:     info.WarehouseInfotId,
-					WarehouseOutDetailId:    info.ID,
-					CancelOutDetailId:       cancelInfo.ID,
-					ProductDate:             info.ProductDate,
-					ExpireDate:              info.ExpiryDate,
-					StorehouseId:            houseConfig.StorehouseOutInfo,
-					OverCount:               over_count,
+				if info.Count >= prescribingNumber {
+					flow := models.VmStockFlow{
+						WarehousingId:           info.WarehouseInfotId,
+						GoodId:                  project.ProjectId,
+						Number:                  info.Number,
+						LicenseNumber:           info.LicenseNumber,
+						Count:                   prescribingNumber,
+						UserOrgId:               adminInfo.CurrentOrgId,
+						PatientId:               project.PatientId,
+						SystemTime:              info.SysRecordTime,
+						ConsumableType:          7,
+						IsSys:                   0,
+						WarehousingOrder:        "",
+						WarehouseOutId:          info.WarehouseOutId,
+						WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+						IsEdit:                  0,
+						CancelStockId:           cancel.ID,
+						CancelOrderNumber:       cancel.OrderNumber,
+						Manufacturer:            manufacturer.ID,
+						Dealer:                  0,
+						Creator:                 adminInfo.AdminUser.Id,
+						UpdateCreator:           0,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   0,
+						Price:                   info.Price,
+						WarehousingDetailId:     info.WarehouseInfotId,
+						WarehouseOutDetailId:    info.ID,
+						CancelOutDetailId:       cancelInfo.ID,
+						ProductDate:             info.ProductDate,
+						ExpireDate:              info.ExpiryDate,
+						StorehouseId:            houseConfig.StorehouseOutInfo,
+						OverCount:               over_count,
+					}
+					service.CreateStockFlowOne(flow)
+				}
+
+				if info.Count < prescribingNumber {
+					flow := models.VmStockFlow{
+						WarehousingId:           info.WarehouseInfotId,
+						GoodId:                  project.ProjectId,
+						Number:                  info.Number,
+						LicenseNumber:           info.LicenseNumber,
+						Count:                   info.Count,
+						UserOrgId:               adminInfo.CurrentOrgId,
+						PatientId:               project.PatientId,
+						SystemTime:              info.SysRecordTime,
+						ConsumableType:          7,
+						IsSys:                   0,
+						WarehousingOrder:        "",
+						WarehouseOutId:          info.WarehouseOutId,
+						WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+						IsEdit:                  0,
+						CancelStockId:           cancel.ID,
+						CancelOrderNumber:       cancel.OrderNumber,
+						Manufacturer:            manufacturer.ID,
+						Dealer:                  0,
+						Creator:                 adminInfo.AdminUser.Id,
+						UpdateCreator:           0,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   0,
+						Price:                   info.Price,
+						WarehousingDetailId:     info.WarehouseInfotId,
+						WarehouseOutDetailId:    info.ID,
+						CancelOutDetailId:       cancelInfo.ID,
+						ProductDate:             info.ProductDate,
+						ExpireDate:              info.ExpiryDate,
+						StorehouseId:            houseConfig.StorehouseOutInfo,
+						OverCount:               over_count,
+					}
+					service.CreateStockFlowOne(flow)
 				}
-				service.CreateStockFlowOne(flow)
 
 				//查询已出库数量
 				dialysisInfo, _ := service.GetGoodDialysisOutInfoSix(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
@@ -3048,18 +3197,12 @@ func (c *HisApiController) DeleteProject() {
 					//改变数量
 					service.UpdateAutoGood(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId, id, prescribingNumber)
 				}
-				fmt.Println("prescribingNumber", prescribingNumber)
-				fmt.Println("Count2332333223qw", dialysisInfo.Count)
-				if prescribingNumber == dialysisInfo.Count {
+
+				if prescribingNumber >= dialysisInfo.Count {
 					//删除出库表
 					service.DeleteAutoRedeceDetailTen(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, project.ProjectId)
 				}
 
-				//退库数量增加
-				service.UpdateSumAddCancelCount(adminInfo.CurrentOrgId, project.ProjectId, houseConfig.StorehouseOutInfo, prescribingNumber)
-				//出库数量减少
-				service.UpdateSumCount(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, prescribingNumber)
-
 				//更新剩余库存
 				service.UpdateSumGood(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, over_count)
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -2959,7 +2959,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if adminInfo.Org.Id == 10395 {
+			if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / 1000 / float64(totalMin) * 1000)
 
 				record.UltrafiltrationRate = ultrafiltration_rate
@@ -2989,7 +2989,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10395 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate / 1000)
@@ -4886,6 +4886,9 @@ func (c *DialysisAPIController) EditConsumables() {
 
 	var newBeforePrepares []*models.NewDialysisBeforePrepareGoods
 
+	var cancelbefor []*models.DialysisBeforePrepareGoods
+	var outbefor []*models.DialysisBeforePrepareGoods
+
 	//判断是否开启自动出库
 	_, record := service.FindAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
 
@@ -4949,62 +4952,280 @@ func (c *DialysisAPIController) EditConsumables() {
 					goodInfo, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
 					//判断当前出库数量和最后一次出库数量的大小
 					//如果当前出库数量小于最后一次出库数量 正常出库后 需要退库操作
-
 					if item.Count < goodInfo.Count {
-						//退库
-						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
-
-						//查询默认仓库
-						storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-						stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
-						var total_count int64
-						for _, it := range stockList {
-							total_count += it.StockCount
-						}
-						//基础库插入数据
-						service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
-						//更新剩余库存
-						goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
-						var flush_count int64
-						for _, it := range goodList {
-							flush_count += it.StockCount
-						}
-						service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
-						break
+						cancelbefor = append(cancelbefor, item)
 					}
 
-					var last_total int64
-
 					//如果当前出库数量大于 最后一次出库数量，那么则需要去查询当前批次耗材的库存是否足够
 					if item.Count > goodInfo.Count {
 
-						//计算当前出库和最后一次出库数据相差数据
-						last_total = item.Count - goodInfo.Count
-
-						//查询该批次剩余库存
-						lastInfo, _ := service.GetLastStockOut(goodInfo.WarehouseInfotId)
-
-						if lastInfo.StockCount == 0 {
-							//查询该耗材的总库存
-							wareinfo, _ := service.GetStockGoodCount(item.GoodId)
-							if wareinfo.StockCount == 0 {
-								goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
-								c.ServeSuccessJSON(map[string]interface{}{
-									"message":            "1",
-									"good_name":          goodObj.GoodName,
-									"specification_name": goodObj.SpecificationName,
-								})
-								return
+						outbefor = append(outbefor, item)
+					}
+
+					//处理编辑耗材新增不了的问题
+					if goodInfo.Count == item.Count {
+						lastCount, _ := service.GetAutoGoodLastCount(item.GoodId, item.Count, record_time, patient_id)
+						service.UpdateLastAutoCount(lastCount.ID, item.Count)
+					}
+
+				}
+
+				fmt.Println("退库长度", len(cancelbefor))
+				fmt.Println("出库长度", len(outbefor))
+				//退库
+				for _, item := range cancelbefor {
+					warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+					creater := adminInfo.AdminUser.Id
+					//退库
+					//err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, cancelbefor, adminInfo.AdminUser.Id, item.Count)
+					//查询该患者当天已经出库的耗材信息
+
+					warehouseOutInfos, _ := service.FindStockOutInfoByStockTwo(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, record_time, patient_id)
+
+					var delete_count int64 = 0
+
+					delete_count = warehouseOutInfos.Count - item.Count
+
+					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+
+					// 在出库记录表里记录退库详情
+					warehouseOutInfo := &models.WarehouseOutInfo{
+						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+						WarehouseOutId:          warehouseOut.ID,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						OrgId:                   adminInfo.Org.Id,
+						Type:                    1,
+						IsSys:                   1,
+						SysRecordTime:           record_time,
+						GoodTypeId:              item.GoodTypeId,
+						GoodId:                  item.GoodId,
+						PatientId:               patient_id,
+						ConsumableType:          2,
+						StorehouseId:            houseConfig.StorehouseOutInfo,
+						IsCheck:                 1,
+					}
+					warehouseOutInfo.Count = item.Count
+
+					stockInInfo, _ := service.FindLastStockInInfoRecord(item.GoodId, adminInfo.Org.Id)
+					warehouseOutInfo.Price = stockInInfo.Price
+					warehouseOutInfo.Dealer = stockInInfo.Dealer
+					warehouseOutInfo.Manufacturer = stockInInfo.Manufacturer
+					warehouseOutInfo.ExpiryDate = stockInInfo.ExpiryDate
+					warehouseOutInfo.ProductDate = stockInInfo.ProductDate
+					warehouseOutInfo.Number = warehouseOutInfos.Number
+					warehouseOutInfo.LicenseNumber = stockInInfo.LicenseNumber
+					warehouseOutInfo.WarehouseInfotId = stockInInfo.ID
+					//查找当天是否存在出库记录
+
+					_, errcod := service.GetWarehouseOutInfoIsExistOne(item.GoodId, patient_id, record_time, 0)
+
+					if errcod == gorm.ErrRecordNotFound {
+						service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+						//插入详情明细表
+						stockFlow := models.VmStockFlow{
+							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+							WarehouseOutId:          warehouseOut.ID,
+							GoodId:                  item.GoodId,
+							Number:                  warehouseOutInfos.Number,
+							ProductDate:             stockInInfo.ProductDate,
+							ExpireDate:              stockInInfo.ExpiryDate,
+							Count:                   item.Count,
+							Price:                   stockInInfo.Price,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							UserOrgId:               adminInfo.Org.Id,
+							Manufacturer:            stockInInfo.Manufacturer,
+							Dealer:                  stockInInfo.Dealer,
+							LicenseNumber:           stockInInfo.LicenseNumber,
+							IsEdit:                  2,
+							Creator:                 creater,
+							SystemTime:              record_time,
+							ConsumableType:          3,
+							WarehousingDetailId:     0,
+							IsSys:                   1,
+							UpdateCreator:           creater,
+							PatientId:               patient_id,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
+						}
+						exsit, errflow := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
+						if errflow == gorm.ErrRecordNotFound {
+							//创建流水表
+							err := service.CreateStockFlowOne(stockFlow)
+							fmt.Println("err", err)
+						} else if errflow == nil {
+							//插入详情明细表
+							stockFlow := models.VmStockFlow{
+								ID:                      exsit.ID,
+								WarehousingId:           warehouseOutInfos.WarehouseInfotId,
+								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+								WarehouseOutId:          warehouseOut.ID,
+								GoodId:                  item.GoodId,
+								Number:                  warehouseOutInfos.Number,
+								ProductDate:             stockInInfo.ProductDate,
+								ExpireDate:              stockInInfo.ExpiryDate,
+								Count:                   exsit.Count - delete_count,
+								Price:                   stockInInfo.Price,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								UserOrgId:               adminInfo.Org.Id,
+								Manufacturer:            stockInInfo.Manufacturer,
+								Dealer:                  stockInInfo.Dealer,
+								LicenseNumber:           stockInInfo.LicenseNumber,
+								IsEdit:                  2,
+								Creator:                 creater,
+								SystemTime:              record_time,
+								ConsumableType:          3,
+								WarehousingDetailId:     0,
+								IsSys:                   1,
+								UpdateCreator:           creater,
+								PatientId:               patient_id,
+								StorehouseId:            houseConfig.StorehouseOutInfo,
 							}
 
+							service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
 						}
 
-						//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
+					} else if errcod == nil {
+						service.UpdatedWarehouseOutInfo(warehouseOutInfo, item.GoodId, patient_id, record_time, 0)
+						//插入详情明细表
+						stockFlow := models.VmStockFlow{
+							WarehousingId:           warehouseOutInfos.WarehouseInfotId,
+							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+							WarehouseOutId:          warehouseOut.ID,
+							GoodId:                  item.GoodId,
+							Number:                  warehouseOutInfos.Number,
+							ProductDate:             stockInInfo.ProductDate,
+							ExpireDate:              stockInInfo.ExpiryDate,
+							Count:                   item.Count,
+							Price:                   stockInInfo.Price,
+							Status:                  1,
+							Ctime:                   time.Now().Unix(),
+							UserOrgId:               adminInfo.Org.Id,
+							Manufacturer:            stockInInfo.Manufacturer,
+							Dealer:                  stockInInfo.Dealer,
+							LicenseNumber:           stockInInfo.LicenseNumber,
+							IsEdit:                  2,
+							Creator:                 creater,
+							SystemTime:              record_time,
+							ConsumableType:          3,
+							WarehousingDetailId:     0,
+							IsSys:                   1,
+							UpdateCreator:           creater,
+							PatientId:               patient_id,
+							ReturnCount:             delete_count,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
+						}
+						exsit, errflows := service.GetStockFlowIsExsit(warehouseOutInfos.WarehouseInfotId, patient_id, record_time, item.GoodId)
+						if errflows == gorm.ErrRecordNotFound {
+							//创建流水表
+							service.CreateStockFlowOne(stockFlow)
+						} else if errflows == nil {
+							stockFlow := models.VmStockFlow{
+								WarehousingId:           warehouseOutInfos.WarehouseInfotId,
+								ID:                      exsit.ID,
+								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+								WarehouseOutId:          warehouseOut.ID,
+								GoodId:                  item.GoodId,
+								Number:                  warehouseOutInfos.Number,
+								ProductDate:             stockInInfo.ProductDate,
+								ExpireDate:              stockInInfo.ExpiryDate,
+								Count:                   exsit.Count - delete_count,
+								Price:                   stockInInfo.Price,
+								Status:                  1,
+								Ctime:                   time.Now().Unix(),
+								UserOrgId:               adminInfo.Org.Id,
+								Manufacturer:            stockInInfo.Manufacturer,
+								Dealer:                  stockInInfo.Dealer,
+								LicenseNumber:           stockInInfo.LicenseNumber,
+								IsEdit:                  2,
+								Creator:                 creater,
+								SystemTime:              record_time,
+								ConsumableType:          3,
+								WarehousingDetailId:     0,
+								IsSys:                   1,
+								UpdateCreator:           creater,
+								PatientId:               patient_id,
+								ReturnCount:             delete_count,
+								StorehouseId:            houseConfig.StorehouseOutInfo,
+							}
+							service.UpdatedStockFlowOne(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
+						}
+
+					}
+
+					//更改自动出库的表格
+					details := models.BloodAutomaticReduceDetail{
+						WarehouseOutId:          warehouseOutInfo.ID,
+						WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+						PatientId:               patient_id,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   time.Now().Unix(),
+						Status:                  1,
+						RecordTime:              record_time,
+						OrgId:                   adminInfo.Org.Id,
+						GoodId:                  item.GoodId,
+						GoodTypeId:              item.GoodTypeId,
+						Count:                   item.Count,
+						StorehouseId:            houseConfig.StorehouseOutInfo,
+					}
+					//查询当天耗材是否已经存在数据
+					_, errcode := service.GetAutoMaticReduceDetail(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+
+					if errcode == gorm.ErrRecordNotFound {
+						service.CreateAutoReduceRecord(&details)
+
+					} else if errcode == nil {
+						service.DeleteAutoRedeceDetailTwo(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+						service.CreateAutoReduceRecord(&details)
+
+					}
+
+					service.ModifyGoodAddInformation(item.GoodId, delete_count, adminInfo.Org.Id)
+
+					//增加出库库存数量
+					service.ModifyReduceGoodSumCount(houseConfig.StorehouseOutInfo, delete_count, adminInfo.Org.Id, item.GoodId)
+
+					errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, item.GoodId, delete_count, patient_id)
+					fmt.Println("errOne", errOne)
+					// 删除出库完成后，要增加对应批次的库存数量
+
+					service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count, patient_id, record_time, item.GoodId)
+
+					//查询默认仓库
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+					var total_count int64
+					for _, it := range stockList {
+						total_count += it.StockCount
+					}
+					//基础库插入数据
+					service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
+					//更新剩余库存
+					goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
+					var flush_count int64
+					for _, it := range goodList {
+						flush_count += it.StockCount
+					}
+					service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+				}
+
+				//出库
+				for _, item := range outbefor {
+					fmt.Println("出库ID", item.GoodId)
+					var last_total int64
+					//1.查看该患者该耗材型号最后一次出库数量
+					goodInfoOne, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
+					//计算当前出库和最后一次出库数据相差数据
+					last_total = item.Count - goodInfoOne.Count
+
+					//查询该批次剩余库存
+					lastInfo, _ := service.GetLastStockOut(goodInfoOne.WarehouseInfotId)
 
+					if lastInfo.StockCount == 0 {
 						//查询该耗材的总库存
 						wareinfo, _ := service.GetStockGoodCount(item.GoodId)
-						// 如果库存差大于剩余库存则提示库存不足
-						if last_total > wareinfo.StockCount {
+						if wareinfo.StockCount == 0 {
 							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 							c.ServeSuccessJSON(map[string]interface{}{
 								"message":            "1",
@@ -5012,31 +5233,104 @@ func (c *DialysisAPIController) EditConsumables() {
 								"specification_name": goodObj.SpecificationName,
 							})
 							return
-						} else {
+						}
 
-							//出库
-							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
+					}
 
-							storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-							stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
-							var total_count int64
-							for _, it := range stockList {
-								total_count += it.StockCount
-							}
-							//基础库插入数据
-							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
-							//剩余库存
+					//比较剩余库存 和 当前相差的数量,库存剩余量大于则正常出库
 
-							goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
-							var flush_count int64
-							for _, it := range goodList {
-								flush_count += it.StockCount
+					//查询该耗材的总库存
+					wareinfo, _ := service.GetStockGoodCount(item.GoodId)
+					// 如果库存差大于剩余库存则提示库存不足
+					if last_total > wareinfo.StockCount {
+						goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+						c.ServeSuccessJSON(map[string]interface{}{
+							"message":            "1",
+							"good_name":          goodObj.GoodName,
+							"specification_name": goodObj.SpecificationName,
+						})
+						return
+					} else {
+
+						fmt.Println("出库2o2o2o2o2oo2o2o2o2o2o2o", item.GoodId)
+
+						out, err := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						if err == gorm.ErrRecordNotFound {
+							//没有记录，则创建出库单
+							timeStr := time.Now().Format("2006-01-02")
+							timeArr := strings.Split(timeStr, "-")
+							total, _ := service.FindAllWarehouseOut(adminInfo.Org.Id)
+							total = total + 1
+							warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+							number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+							number = number + total
+							warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+							warehouseOut := models.WarehouseOut{
+								WarehouseOutOrderNumber: warehousing_out_order,
+								OperationTime:           time.Now().Unix(),
+								OrgId:                   adminInfo.Org.Id,
+								Creater:                 adminInfo.AdminUser.Id,
+								Ctime:                   time.Now().Unix(),
+								Status:                  1,
+								WarehouseOutTime:        record_time,
+								Dealer:                  0,
+								Manufacturer:            0,
+								Type:                    1,
+								IsSys:                   1,
+								StorehouseId:            houseConfig.StorehouseOutInfo,
+								IsCheck:                 1,
 							}
-							service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
-							break
+							service.AddSigleWarehouseOut(&warehouseOut)
+
 						}
-					}
+						//出库
+						//err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, outbefor, newBeforePrepares, adminInfo.AdminUser.Id)
+						//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						//1.查看该患者该耗材型号最后一次出库数量
+						goodInfoTwo, _ := service.GetLastGoodListByPatientIdOne(record_time, patient_id, item.GoodId, item.GoodTypeId)
 
+						fmt.Println("count2323323222323wi", item.Count)
+						prepare := models.DialysisBeforePrepare{
+							UserOrgId:    adminInfo.Org.Id,
+							PatientId:    patient_id,
+							RecordDate:   record_time,
+							GoodId:       item.GoodId,
+							GoodTypeId:   item.GoodTypeId,
+							Count:        item.Count - goodInfoTwo.Count,
+							Ctime:        time.Now().Unix(),
+							Mtime:        0,
+							Creater:      adminInfo.AdminUser.Id,
+							Modifier:     adminInfo.AdminUser.Id,
+							Status:       1,
+							CommdityCode: "",
+							NewCount:     0,
+							ProjectId:    0,
+							StorehouseId: houseConfig.StorehouseOutInfo,
+						}
+						fmt.Println("prepare", prepare.Count)
+						fmt.Println("count", item.Count)
+						service.ConsumablesGoodDelivery(adminInfo.Org.Id, patient_id, record_time, &prepare, &out, item.Count)
+						//增加出库数量
+						service.ModifyGoodSumCount(houseConfig.StorehouseOutInfo, prepare.Count, adminInfo.Org.Id, item.GoodId)
+
+						storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+						var total_count int64
+						for _, it := range stockList {
+							total_count += it.StockCount
+						}
+						//基础库插入数据
+						service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
+						//剩余库存
+
+						goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId)
+						var flush_count int64
+						for _, it := range goodList {
+							flush_count += it.StockCount
+						}
+						service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+					}
 				}
 
 				//查询今日出库数据
@@ -5075,15 +5369,15 @@ func (c *DialysisAPIController) EditConsumables() {
 						flush_count += it.StockCount
 					}
 					service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, it.GoodId, flush_count)
-					if err != nil {
-						goodObj, _ := service.GetGoodInformationByGoodId(it.GoodId)
-						c.ServeSuccessJSON(map[string]interface{}{
-							"message":            "2",
-							"good_name":          goodObj.GoodName,
-							"specification_name": goodObj.SpecificationName,
-						})
-						return
-					}
+					//if err != nil {
+					//	goodObj, _ := service.GetGoodInformationByGoodId(it.GoodId)
+					//	c.ServeSuccessJSON(map[string]interface{}{
+					//		"message":            "2",
+					//		"good_name":          goodObj.GoodName,
+					//		"specification_name": goodObj.SpecificationName,
+					//	})
+					//	return
+					//}
 				}
 			}
 		}
@@ -6072,6 +6366,7 @@ func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int6
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
 
+	fmt.Println("剩余需要出库的", len(goods))
 	if len(goods) > 0 {
 		out, err := service.FindStockOutByIsSys(orgID, 1, record_time)
 		houseConfig, _ := service.GetAllStoreHouseConfig(orgID)
@@ -6251,6 +6546,7 @@ func (this *DialysisAPIController) GetRoleList() {
 
 func ConsumablesDeliveryDeleteNew(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut, patient_id int64, creater int64, count int64) (err error) {
 
+	fmt.Println("退库222322232322332232332322332232332233wo", good_yc.GoodId)
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := service.FindStockOutInfoByStockTwo(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time, good_yc.PatientId)
 

models/device_models.go

@@ -145,7 +145,7 @@ type DeviceNumber struct {
 	Number     string     `gorm:"column:number" json:"number"`
 	GroupID    int64      `gorm:"column:group_id" json:"group_id"`
 	ZoneID     int64      `gorm:"column:zone_id" json:"zone_id"`
-	Status     int8       `json:"-"`
+	Status     int64      `gorm:"column:status" json:"status" form:"status"`
 	CreateTime int64      `gorm:"column:ctime" json:"-"`
 	ModifyTime int64      `gorm:"column:mtime" json:"-"`
 	Sort       int64      `gorm:"column:sort" json:"sort" form:"sort"`
@@ -868,6 +868,7 @@ type XtAssessmentAfterDislysis struct {
 	CvcA                            float64 `gorm:"column:cvc_a" json:"cvc_a" form:"cvc_a"`
 	CvcV                            float64 `gorm:"column:cvc_v" json:"cvc_v" form:"cvc_v"`
 	Channel                         int64   `gorm:"column:channel" json:"channel" form:"channel"`
+	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
 }
 
 func (XtAssessmentAfterDislysis) TableName() string {

models/new_stock_models.go

@@ -145,33 +145,38 @@ func (NewBaseDrug) TableName() string {
 }
 
 type XtDialysisSetting 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"`
-	Status                int64 `gorm:"column:status" json:"status" form:"status"`
-	DeviceNumber          int64 `gorm:"column:device_number" json:"device_number" form:"device_number"`
-	DeviceType            int64 `gorm:"column:device_type" json:"device_type" form:"device_type"`
-	Name                  int64 `gorm:"column:name" json:"name" form:"name"`
-	AdmissionNumber       int64 `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
-	DialysisNo            int64 `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
-	WeightBefor           int64 `gorm:"column:weight_befor" json:"weight_befor" form:"weight_befor"`
-	DryWeight             int64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
-	BloodPressure         int64 `gorm:"column:blood_pressure" json:"blood_pressure" form:"blood_pressure"`
-	UltrafiltrationVolume int64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
-	InternalFistula       int64 `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
-	BloodFlowVolume       int64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
-	Anticoagulant         int64 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
-	SealingFluidDispose   int64 `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
-	ModeId                int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	DialysisTime          int64 `gorm:"column:dialysis_time" json:"dialysis_time" form:"dialysis_time"`
-	DialysisDialyszers    int64 `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
-	DialysisIrrigation    int64 `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
-	Gaijiliang            int64 `gorm:"column:gaijiliang" json:"gaijiliang" form:"gaijiliang"`
-	Kalium                int64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
-	DisplaceLiquiValue    int64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
-	Bicarbonate           int64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
-	Glucose               int64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
-	Ctime                 int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                 int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	ID                         int64 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                     int64 `gorm:"column:status" json:"status" form:"status"`
+	DeviceNumber               int64 `gorm:"column:device_number" json:"device_number" form:"device_number"`
+	DeviceType                 int64 `gorm:"column:device_type" json:"device_type" form:"device_type"`
+	Name                       int64 `gorm:"column:name" json:"name" form:"name"`
+	AdmissionNumber            int64 `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`
+	DialysisNo                 int64 `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	WeightBefor                int64 `gorm:"column:weight_befor" json:"weight_befor" form:"weight_befor"`
+	DryWeight                  int64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	BloodPressure              int64 `gorm:"column:blood_pressure" json:"blood_pressure" form:"blood_pressure"`
+	UltrafiltrationVolume      int64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume" form:"ultrafiltration_volume"`
+	InternalFistula            int64 `gorm:"column:internal_fistula" json:"internal_fistula" form:"internal_fistula"`
+	BloodFlowVolume            int64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	Anticoagulant              int64 `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	SealingFluidDispose        int64 `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
+	ModeId                     int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisTime               int64 `gorm:"column:dialysis_time" json:"dialysis_time" form:"dialysis_time"`
+	DialysisDialyszers         int64 `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         int64 `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	Gaijiliang                 int64 `gorm:"column:gaijiliang" json:"gaijiliang" form:"gaijiliang"`
+	Kalium                     int64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	DisplaceLiquiValue         int64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	Bicarbonate                int64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
+	Glucose                    int64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	Ctime                      int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                      int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Sodium                     int64 `gorm:"column:sodium" json:"sodium" form:"sodium"`
+	Calcium                    int64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	BloodAccess                int64 `gorm:"column:blood_access" json:"blood_access" form:"blood_access"`
+	DialyzerPerfusionApparatus int64 `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	DisplaceLiquiPart          int64 `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
 }
 
 func (XtDialysisSetting) TableName() string {

models/schedule_models.go

@@ -306,10 +306,13 @@ type VmBloodSchedule struct {
 	DeviceNumber               *NewMDeviceNumberVM        `gorm:"ForeignKey:BedId" json:"device_number"`
 	SchedualPatient            *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
 	DialysisSolution           DialysisSolution           `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
-	DialysisPrescription       DialysisPrescription       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"dialysis_prescription"`
-	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,AssessmentDate" json:"assessment_befor_dislysis"`
-	XtDoctorAdvice             XtDoctorAdvice             `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,AdviceDate" json:"xt_doctor_advice"`
-	HisDoctorAdvice            HisDoctorAdvice            `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,AdviceDate" json:"his_doctor_advice"`
+	DialysisPrescription       DialysisPrescription       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"dialysis_prescription"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"assessment_befor_dislysis"`
+	XtDoctorAdvice             XtDoctorAdvice             `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_doctor_advice"`
+	HisDoctorAdvice            HisDoctorAdvice            `gorm:"ForeignKey:PatientId,AdviceDate;AssociationForeignKey:PatientId,ScheduleDate" json:"his_doctor_advice"`
+	ReceiveTreatmentAsses      ReceiveTreatmentAsses      `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_receive_treatment_asses"`
+	XtAssessmentAfterDislysis  XtAssessmentAfterDislysis  `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate" json:"xt_assesment_after_dislysis"`
+	LastAfterWeight            AssessmentAfterDislysis    `gorm:"ForeignKey:PatientID;AssociationForeignKey:PatientID" json:"lastafterweight"`
 }
 
 func (VmBloodSchedule) TableName() string {
@@ -340,6 +343,7 @@ type NewMSchedualPatientVMList struct {
 	IdCardNo           string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
 	UserSysBeforeCount int64  `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	TrobleShoot        int64  `gorm:"column:troble_shoot" json:"troble_shoot" form:"troble_shoot"`
+	Status             int64  `gorm:"column:status" json:"status" form:"status"`
 }
 
 func (NewMSchedualPatientVMList) TableName() string {

service/dialysis_service.go

@@ -1508,7 +1508,7 @@ func SaveHisProject(advice *models.HisPrescriptionProject) (err error) {
 }
 
 func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (advice []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1 and user_org_id = ?", orgID).Preload("GoodInfo", "status = 1 and org_id = ?", orgID).Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }
 

service/dialysis_solution_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"XT_New/models"
+	"github.com/jinzhu/gorm"
 )
 
 func GetPatientSolutionGroupList(patient_id int64, orgid int64) (solution []*models.DialysisSolution, err error) {
@@ -41,28 +42,29 @@ func GetLastPatientDialysisSolution(patient_id int64, orgid int64) (models.Dialy
 
 func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
 
-	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
-		db = db.Where("schedule_date = ?", scheduleDate)
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
 	}
 	if schedule_type > 0 {
-		db = db.Where("schedule_type = ?", schedule_type)
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
 	}
 	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+		db = db.Where("xt_schedule.partition_id = ?", partition_id)
 	}
 	if orgID > 0 {
-		db = db.Where("user_org_id  = ?", orgID)
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"
-		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
-		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID).Find(&schedule).Error
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ? and solution_status = 1", orgID)
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).Find(&schedule).Error
 	} else {
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
@@ -74,19 +76,19 @@ func GetPatientDialysisSolutionGroupList(keywords string, limit int64, page int6
 }
 
 func GetDialysisAdviceTemplateList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
-	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
-		db = db.Where("schedule_date = ?", scheduleDate)
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
 	}
 	if schedule_type > 0 {
-		db = db.Where("schedule_type = ?", schedule_type)
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
 	}
 	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+		db = db.Where("xt_schedule.partition_id = ?", partition_id)
 	}
 	if orgID > 0 {
-		db = db.Where("user_org_id  = ?", orgID)
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
 
 	if len(keywords) > 0 {
@@ -130,19 +132,19 @@ func GetDialysisSetting(orgid int64) (models.XtDialysisSetting, error) {
 }
 
 func GetDialysisParameterList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
-	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("xt_schedule.status = 1")
 	offset := (page - 1) * limit
 	if scheduleDate > 0 {
-		db = db.Where("schedule_date = ?", scheduleDate)
+		db = db.Where("xt_schedule.schedule_date = ?", scheduleDate)
 	}
 	if schedule_type > 0 {
-		db = db.Where("schedule_type = ?", schedule_type)
+		db = db.Where("xt_schedule.schedule_type = ?", schedule_type)
 	}
 	if partition_id > 0 {
-		db = db.Where("partition_id = ?", partition_id)
+		db = db.Where("xt_schedule.partition_id = ?", partition_id)
 	}
 	if orgID > 0 {
-		db = db.Where("user_org_id  = ?", orgID)
+		db = db.Where("xt_schedule.user_org_id  = ?", orgID)
 	}
 
 	if len(keywords) > 0 {
@@ -150,15 +152,28 @@ func GetDialysisParameterList(keywords string, limit int64, page int64, partitio
 		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
 			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, scheduleDate)
+			}).
+			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
 	} else {
 		err = db.Count(&total).Offset(offset).Limit(limit).Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+			Preload("DialysisSolution", "status = 1 AND user_org_id = ?", orgID).
 			Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
 			Preload("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
-			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+			Preload("ReceiveTreatmentAsses", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+			Preload("XtAssessmentAfterDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("XtDoctorAdvice", "status = 1 AND user_org_id = ? and advice_date = ? and advice_type = 1", orgID, scheduleDate).
+			Preload("LastAfterWeight", func(db *gorm.DB) *gorm.DB {
+				return db.Where("user_org_id = ? and status = 1 and assessment_date < ?", orgID, scheduleDate)
+			}).Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
 	}
 
 	return schedule, total, err

service/new_stock_service.go

@@ -345,3 +345,17 @@ func UpdateSumOutDrug(orgid int64, storehouse_id int64, drug_id int64, sum_out_c
 	db.Commit()
 	return err
 }
+
+func GetAutoGoodLastCount(goodid int64, count int64, record_time int64, patient_id int64) (models.AutomaticReduceDetail, error) {
+
+	detail := models.AutomaticReduceDetail{}
+	err := XTReadDB().Where("good_id = ? and count = ? and record_time = ? and patient_id = ?", goodid, count, record_time, patient_id).Last(&detail).Error
+	return detail, err
+}
+
+func UpdateLastAutoCount(id int64, count int64) error {
+
+	detail := models.AutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("id = ?", id).Update(map[string]interface{}{"count": count, "status": 1}).Error
+	return err
+}

service/new_warehouse_service.go

@@ -1301,7 +1301,24 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		return err
 	}
 	// 将该批次的剩余库存数量转换为拆零数量
-	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+	// 将该批次的剩余库存数量转换为拆零数量
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+		fmt.Println("进来1")
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+		fmt.Println("剩余库存1", stock_number)
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+		fmt.Println("进来2")
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+		fmt.Println("剩余库存2", stock_number)
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+		fmt.Println("进来3")
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+		fmt.Println("剩余库存3", stock_number)
+	}
+	fmt.Println("剩余库存23333333333333333333333333333wo", stock_number)
+	fmt.Println("出库数量2333333333333333333333333333333333333wo", deliver_number)
 
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
@@ -1322,7 +1339,15 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			}
 		}
 
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
 
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
@@ -1333,18 +1358,27 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		warehouse.Mtime = time.Now().Unix()
 
+		fmt.Println("minnU目标而332322323323233223323223我", minNumber)
+		fmt.Println("max_number232232332232322wo", maxNumber)
+		fmt.Println(" warehouse.StockMinNumber", warehouse.StockMinNumber)
 		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
+				if (warehouse.StockMinNumber - minNumber) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+				}
+
 			}
 
 			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
 				if warehouse.StockMinNumber > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					if warehouse.StockMinNumber-deliver_number >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+					}
+
 				}
 
 			}
@@ -1352,7 +1386,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}
 
@@ -1960,7 +1994,7 @@ func GetSigleDrugWarehouseOutInfoOne(patient_id int64, advice_date int64, orgid
 
 func UpdateSingleDrugWarehouseOutInfoSix(patient_id int64, advice_date int64, orgid int64, info *models.DrugWarehouseOutInfo, advice_id int64) error {
 
-	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and advice_date = ? and org_id = ? and advice_id = ?", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
+	err := XTWriteDB().Model(&models.XtDrugWarehouseOutInfo{}).Where("patient_id = ? and sys_record_time = ? and org_id = ? and advice_id = ?", patient_id, advice_date, orgid, advice_id).Update(map[string]interface{}{"count": info.Count, "price": info.Price, "total_price": info.TotalPrice, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "number": info.Number, "batch_number": info.BatchNumber, "count_unit": info.CountUnit, "warehouse_info_id": info.WarehouseInfoId, "storehouse_id": info.StorehouseId}).Error
 	return err
 }
 

service/warhouse_service.go

@@ -134,7 +134,21 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 	// 将该批次的剩余库存数量转换为拆零数量
 
-	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+
+	}
 
 	var maxNumber int64 = 0
 	var minNumber int64 = 0
@@ -152,7 +166,15 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		}
 	}
 
-	warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+	if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+	}
+	if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+	}
+	if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+	}
 
 	if warehouse.StockMaxNumber < 0 {
 		warehouse.StockMaxNumber = 0
@@ -169,12 +191,18 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 	} else {
 		if minNumber > 0 {
-			warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			if (warehouse.StockMinNumber - minNumber) >= 0 {
+				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+			}
+
 		}
 
 		if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
 			if warehouse.StockMinNumber > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				if (warehouse.StockMinNumber - deliver_number) >= 0 {
+					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+				}
+
 			}
 
 		}
@@ -182,7 +210,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	}
 
 	if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-		if (warehouse.StockMinNumber - deliver_number) > 0 {
+		if (warehouse.StockMinNumber - deliver_number) >= 0 {
 			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 		}
 
@@ -5480,7 +5508,9 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 
 // 药品手动出库 递归方式
 func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
-	//开事务
+
+	fmt.Println("出库数量", prescribingNumber)
+
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -5503,6 +5533,8 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 		var stockMin int64
 		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
 		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+		fmt.Println("stockmax", stockMax)
+		fmt.Println("stockMin", stockMin)
 		ChangeMaxNumber(lastWarehouse.ID, stockMax)
 		UpdateMinNumber(lastWarehouse.ID, stockMin)
 	}
@@ -5515,9 +5547,18 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit != drup.MinUnit {
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+	}
+	if warehouse.MaxUnit == drup.MinUnit && drup.MaxUnit != drup.MinUnit {
+		stock_number = warehouse.StockMaxNumber + warehouse.StockMinNumber
+	}
+	if warehouse.MaxUnit == drup.MaxUnit && drup.MaxUnit == drup.MinUnit {
+		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
+	}
 
-	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-
+	fmt.Println("stock_number", stock_number)
+	fmt.Println("deliver_number", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -5539,7 +5580,15 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			}
 		}
 
-		warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
+		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
+		}
 
 		if warehouse.StockMaxNumber < 0 {
 			warehouse.StockMaxNumber = 0
@@ -5554,25 +5603,30 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 		} else {
+			fmt.Println("maxNumber23323323332322323w9", maxNumber)
+			fmt.Println("maxNumber23323323332322323w9", minNumber)
 			if minNumber > 0 {
 				if minNumber == 1 && maxNumber == 1 && drup.MaxUnit != drup.MinUnit {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 				} else {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					if (warehouse.StockMinNumber - minNumber) >= 0 {
+						warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+					}
+
 				}
 			}
 
 			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
+					}
 				}
-
 			}
-
 		}
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
+			if (warehouse.StockMinNumber - deliver_number) >= 0 {
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}