Merge remote-tracking branch 'origin/20230223_xt_api_new_branch' into 20230223_xt_api_new_branch

controllers/doctors_api_controller.go

@@ -1488,7 +1488,8 @@ func (c *DoctorsApiController) CreateFirstDisease() {
 	diagnostic_basis := dataBody["diagnostic_basis"].(string)
 	differential_diagnosis := dataBody["differential_diagnosis"].(string)
 	treatment_plan := dataBody["treatment_plan"].(string)
-
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	firstdisease := models.XtPatientFirstDisease{
 		Title:                 title,
@@ -1505,6 +1506,8 @@ func (c *DoctorsApiController) CreateFirstDisease() {
 		Ctime:                 time.Now().Unix(),
 		Mtime:                 0,
 		Status:                1,
+		ProjectId:             project_id,
+		InspectDate:           inspect_date,
 	}
 
 	error := service.CreatePatientFirstDisease(firstdisease)
@@ -1543,9 +1546,14 @@ func (c *DoctorsApiController) GetFirstDetailById() {
 
 	id, _ := c.GetInt64("id")
 	list, err := service.GetFirstDetailById(id)
+	ids := strings.Split(list.ProjectId, ",")
+	datelist := strings.Split(list.InspectDate, ",")
+	fmt.Println("list232323232323w", datelist)
+	inspectlist, err := service.GetInspectionItemlist(list.PatientId, datelist, ids)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
-			"detail": list,
+			"detail":      list,
+			"inspectlist": inspectlist,
 		})
 		return
 	}
@@ -1571,7 +1579,8 @@ func (c *DoctorsApiController) UpdateFirstDisease() {
 	diagnostic_basis := dataBody["diagnostic_basis"].(string)
 	differential_diagnosis := dataBody["differential_diagnosis"].(string)
 	treatment_plan := dataBody["treatment_plan"].(string)
-
+	inspect_date := dataBody["inspect_date"].(string)
+	project_id := dataBody["project_id"].(string)
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	firstdisease := models.XtPatientFirstDisease{
 		Title:                 title,
@@ -1589,6 +1598,8 @@ func (c *DoctorsApiController) UpdateFirstDisease() {
 		Mtime:                 0,
 		Status:                1,
 		ID:                    id,
+		InspectDate:           inspect_date,
+		ProjectId:             project_id,
 	}
 
 	error := service.UpdatePatientFirstDisease(firstdisease, id)

controllers/his_api_controller.go

@@ -1948,7 +1948,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 
-											//删除记录
 											service.DeleteAutoWarehouse(patient_id, recordDateTime)
 
 										}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -4917,8 +4917,6 @@ func (c *DialysisAPIController) CreateConsumables() {
 			}
 		}
 
-		fmt.Println("active------------------------------------", active)
-		fmt.Println("len------------------------------", len(goods))
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {
@@ -5690,124 +5688,89 @@ func (c *DialysisAPIController) EditConsumables() {
 
 				}
 
-				//退库
-				for _, item := range cancelbefor {
-					warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-					creater := adminInfo.AdminUser.Id
+				if len(cancelbefor) > 0 {
 					//退库
-					//err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, cancelbefor, adminInfo.AdminUser.Id, item.Count)
-					//查询该患者当天已经出库的耗材信息
+					for _, item := range cancelbefor {
+						warehouseOut, _ := service.FindStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
+						creater := adminInfo.AdminUser.Id
 
-					warehouseOutInfos, _ := service.FindStockOutInfoByStockTwo(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, record_time, patient_id)
+						//查询该患者当天已经出库的耗材信息
+						warehouseOutInfos, _ := service.FindStockOutInfoByStockTwo(adminInfo.Org.Id, item.GoodTypeId, item.GoodId, record_time, patient_id)
 
-					var delete_count int64 = 0
+						var delete_count int64 = 0
 
-					delete_count = warehouseOutInfos.Count - item.Count
+						delete_count = warehouseOutInfos.Count - item.Count
 
-					//增加库存数量
-					service.ModifyGoodAddInformation(item.GoodId, delete_count, adminInfo.Org.Id)
+						//增加库存数量
+						service.ModifyGoodAddInformation(item.GoodId, delete_count, adminInfo.Org.Id)
 
-					//增加出库库存数量
-					service.ModifyReduceGoodSumCount(houseConfig.StorehouseOutInfo, delete_count, adminInfo.Org.Id, item.GoodId)
+						//减少实际出库库存数量
+						service.ModifyReduceGoodSumCountTwenty(houseConfig.StorehouseOutInfo, delete_count, adminInfo.Org.Id, item.GoodId)
 
-					// 删除出库完成后，要增加对应批次的库存数量
+						// 删除出库完成后，要增加对应批次的库存数量
 
-					service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count, patient_id, record_time, item.GoodId)
+						service.UpDateWarehouseInfoByStockDelete(warehouseOutInfos.WarehouseInfotId, delete_count, patient_id, record_time, item.GoodId)
 
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 
-					//更新剩余库存
-					goodListOne, _ := service.GetSumGoodList(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId)
-					var flush_count int64
-					for _, it := range goodListOne {
-						flush_count += it.StockCount
-					}
-					service.UpdateSumGood(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
+						//更新剩余库存
+						goodListOne, _ := service.GetSumGoodList(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId)
+						var flush_count int64
+						for _, it := range goodListOne {
+							flush_count += it.StockCount
+						}
+						service.UpdateSumGood(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId, flush_count)
 
-					//查询剩余库存
-					goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
-					var sum_count int64
-					for _, item := range goodList {
-						sum_count += item.StockCount
-					}
+						//查询剩余库存
+						goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
+						var sum_count int64
+						for _, item := range goodList {
+							sum_count += item.StockCount
+						}
 
-					// 在出库记录表里记录退库详情
-					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,
-						OverCount:               sum_count,
-					}
-					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{
+						// 在出库记录表里记录退库详情
+						warehouseOutInfo := &models.WarehouseOutInfo{
 							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,
+							OrgId:                   adminInfo.Org.Id,
+							Type:                    1,
 							IsSys:                   1,
-							UpdateCreator:           creater,
+							SysRecordTime:           record_time,
+							GoodTypeId:              item.GoodTypeId,
+							GoodId:                  item.GoodId,
 							PatientId:               patient_id,
+							ConsumableType:          2,
 							StorehouseId:            houseConfig.StorehouseOutInfo,
+							IsCheck:                 1,
+							OverCount:               sum_count,
 						}
-						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 {
+						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{
-								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,
+								Count:                   item.Count,
 								Price:                   stockInInfo.Price,
 								Status:                  1,
 								Ctime:                   time.Now().Unix(),
@@ -5825,131 +5788,207 @@ func (c *DialysisAPIController) EditConsumables() {
 								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)
-						}
+								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)
+						} else if errcod == nil {
+							service.UpdatedWarehouseOutInfo(warehouseOutInfo, item.GoodId, patient_id, record_time, 0)
 
-						fmt.Println("进来-------------------------------------------------")
+							//查询剩余库存
+							goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
+							var sum_count int64
+							for _, item := range goodList {
+								sum_count += item.StockCount
+							}
 
-						//查询剩余库存
-						goodList, _ := service.GetAllGoodSumCount(item.GoodId, adminInfo.Org.Id, houseConfig.StorehouseOutInfo)
-						var sum_count int64
-						for _, item := range goodList {
-							sum_count += item.StockCount
+							//创建退库单,生成退库数据
+							houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							good, _ := service.FindGoodInfoByIdTwo(item.GoodId)
+
+							operation_time := time.Now().Unix()
+							creater := adminInfo.AdminUser.Id
+							//创建退库单
+							timeStr := time.Now().Format("2006-01-02")
+							timeArr := strings.Split(timeStr, "-")
+							total, _ := service.FindAllCancelStockTotal(adminInfo.Org.Id)
+							total = total + 1
+							orderNumber := "CKTKD" + strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+							cancelStock := models.CancelStock{
+								OrderNumber:  orderNumber,
+								OperaTime:    operation_time,
+								OrgId:        adminInfo.Org.Id,
+								Creater:      creater,
+								Ctime:        time.Now().Unix(),
+								Status:       1,
+								ReturnTime:   record_time,
+								Type:         1,
+								StorehouseId: houseConfig.StorehouseOutInfo,
+								IsCheck:      1,
+							}
+							_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(record_time, adminInfo.Org.Id)
+							if msgerrkonde == gorm.ErrRecordNotFound {
+								service.AddSigleCancelStock(&cancelStock)
+							}
+							cancel, _ := service.GetLastCancelStockById(adminInfo.Org.Id)
+
+							//查询是否有出库
+							info, _ := service.GetLastWarehoseByGoodId(item.GoodId, patient_id, record_time)
+
+							manufacturer, _ := service.GetManufactureById(info.Manufacturer)
+							deaerler, _ := service.GetDealerById(info.Dealer)
+
+							if info.ID > 0 {
+								cancelInfo, _ := service.GetLastCancelStockInfoByGoodId(item.GoodId)
+								cancelStockInfo := models.CancelStockInfo{
+									GoodId:          item.GoodId,
+									CancelStockId:   cancel.ID,
+									GoodTypeId:      good.GoodTypeId,
+									Count:           delete_count,
+									Price:           info.Price,
+									Total:           0,
+									ProductDate:     info.ProductDate,
+									ExpiryDate:      info.ExpiryDate,
+									Ctime:           time.Now().Unix(),
+									Status:          1,
+									OrgId:           adminInfo.Org.Id,
+									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.UpdateSumAddCancelCount(adminInfo.Org.Id, item.GoodId, houseConfig.StorehouseOutInfo, delete_count)
+
+								//查询剩余库存
+								goodList, _ := service.GetSumGoodList(adminInfo.Org.Id, houseConfig.StorehouseOutInfo, item.GoodId)
+								var over_count int64
+								for _, it := range goodList {
+									over_count += it.StockCount
+								}
+
+								flow := models.VmStockFlow{
+									WarehousingId:           info.WarehouseInfotId,
+									GoodId:                  item.GoodId,
+									Number:                  info.Number,
+									LicenseNumber:           info.LicenseNumber,
+									Count:                   delete_count,
+									UserOrgId:               adminInfo.Org.Id,
+									PatientId:               patient_id,
+									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)
+
+							}
 						}
-						//插入详情明细表
-						stockFlow := models.VmStockFlow{
-							WarehousingId:           warehouseOutInfos.WarehouseInfotId,
-							WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-							WarehouseOutId:          warehouseOut.ID,
+
+						//更改自动出库的表格
+						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,
-							Number:                  warehouseOutInfos.Number,
-							ProductDate:             stockInInfo.ProductDate,
-							ExpireDate:              stockInInfo.ExpiryDate,
+							GoodTypeId:              item.GoodTypeId,
 							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,
-							OverCount:               sum_count,
-						}
-						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,
-								OverCount:               exsit.OverCount + delete_count,
-							}
-							fmt.Println("stockFlow--------------------", stockFlow.OverCount)
-							service.UpdatedStockFlowFive(stockFlow, warehouseOut.ID, patient_id, record_time, item.GoodId)
 						}
+						//查询当天耗材是否已经存在数据
+						_, errcode := service.GetAutoMaticReduceDetail(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 
-					}
-
-					//更改自动出库的表格
-					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)
+						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)
+						} else if errcode == nil {
+							service.DeleteAutoRedeceDetailTwo(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
+							service.CreateAutoReduceRecord(&details)
 
-					}
+						}
 
-					//errOne := service.UpDateWarehouStockFlowByStockDelete(warehouseOutInfos.WarehouseInfotId, record_time, item.GoodId, delete_count, patient_id)
-					//fmt.Println("errOne", errOne)
+						//查询默认仓库
+						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)
 
-					//查询默认仓库
-					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)
-
 				}
 
 				fmt.Println("lnet---------------------------", len(outbefor))
@@ -5963,26 +6002,9 @@ func (c *DialysisAPIController) EditConsumables() {
 						//计算当前出库和最后一次出库数据相差数据
 						last_total = item.Count - goodInfoOne.Count
 
-						//查询该批次剩余库存
-						lastInfo, _ := service.GetLastStockOut(goodInfoOne.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
-							}
-
-						}
-
 						//查询该耗材的总库存
 						wareinfo, _ := service.GetStockGoodCount(item.GoodId)
+
 						// 如果库存差大于剩余库存则提示库存不足
 						if last_total > wareinfo.StockCount {
 							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
@@ -6048,8 +6070,7 @@ func (c *DialysisAPIController) EditConsumables() {
 								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)
@@ -6109,6 +6130,7 @@ func (c *DialysisAPIController) EditConsumables() {
 					for _, it := range goodList {
 						flush_count += it.StockCount
 					}
+
 					service.UpdateSumGood(adminInfo.Org.Id, storeHouseConfig.StorehouseOutInfo, it.GoodId, flush_count)
 
 				}
@@ -6373,13 +6395,19 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 				}
 				project_id := int64(items["project_id"].(float64))
 
+				new_count := int64(items["new_count"].(float64))
+				old_count := int64(items["old_count"].(float64))
+
 				prepare := &models.DialysisBeforePrepareGoods{
 					GoodId:       good_id,
 					GoodTypeId:   good_type_id,
 					Count:        count,
 					ProjectId:    project_id,
 					StorehouseId: houseConfig.StorehouseOutInfo,
+					NewCount:     new_count,
+					OldCount:     old_count,
 				}
+
 				beforePrepares = append(beforePrepares, prepare)
 
 				newPrepare := &models.NewDialysisBeforePrepareGoods{
@@ -6388,25 +6416,35 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 					Count:        count,
 					ProjectId:    project_id,
 					StorehouseId: houseConfig.StorehouseOutInfo,
+					NewCount:     new_count,
+					OldCount:     old_count,
 				}
+
 				newBeforePrepares = append(newBeforePrepares, newPrepare)
+
 			}
 		}
 	}
 
 	//查询是否有库存
+
 	for _, item := range beforePrepares {
-		storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, storeConfig.StorehouseOutInfo)
-		if item.Count > warehouse.Count {
-			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
-			c.ServeSuccessJSON(map[string]interface{}{
-				"message":            "1",
-				"good_name":          goodObj.GoodName,
-				"specification_name": goodObj.SpecificationName,
-			})
-			return
+
+		if item.NewCount > 0 {
+			storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+			warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId, storeConfig.StorehouseOutInfo)
+
+			if item.Count > warehouse.Count {
+				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+				c.ServeSuccessJSON(map[string]interface{}{
+					"message":            "1",
+					"good_name":          goodObj.GoodName,
+					"specification_name": goodObj.SpecificationName,
+				})
+				return
+			}
 		}
+
 	}
 
 	//出库逻辑

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -30,18 +30,12 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	loc, _ := time.LoadLocation("Local")
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	orgid := adminUserInfo.Org.Id
-	fmt.Println(orgid)
 	keywords := this.GetString("keyword")
 	start_time := this.GetString("start_time")
-	fmt.Println("start_time", start_time)
 	limit, _ := this.GetInt64("limit")
-	fmt.Println(limit)
 	page, _ := this.GetInt64("page")
-	fmt.Println(page)
 	partitionType, _ := this.GetInt64("partitionType")
-	fmt.Println("partiontype", partitionType)
 	scheduleType, _ := this.GetInt64("scheduleType")
-	fmt.Println(scheduleType)
 
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	if len(keywords) > 0 {

controllers/patient_api_controller.go

@@ -84,7 +84,7 @@ func PatientApiRegistRouters() {
 
 }
 
-//GetPatientsList 取患者列表
+// GetPatientsList 取患者列表
 func (c *PatientApiController) GetPatientsList() {
 	var err error
 	defer func() {
@@ -157,7 +157,7 @@ func (c *PatientApiController) GetPatientsList() {
 
 }
 
-//GetPatientTotal
+// GetPatientTotal
 func (c *PatientApiController) GetPatientTotal() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -182,7 +182,7 @@ func (c *PatientApiController) GetPatientsAllList() {
 	return
 }
 
-//GenerateDialysisNo 生成透析号
+// GenerateDialysisNo 生成透析号
 func (c *PatientApiController) GenerateDialysisNo() {
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -206,7 +206,7 @@ func (c *PatientApiController) GenerateDialysisNo() {
 	return
 }
 
-//CreatePatient 创建患者
+// CreatePatient 创建患者
 func (c *PatientApiController) CreatePatient() {
 	record_date := c.GetString("record_date")
 	is_infectious, _ := c.GetInt64("is_infectious")
@@ -443,7 +443,7 @@ func (c *PatientApiController) CreatePatient() {
 	return
 }
 
-//EditPatient 修改
+// EditPatient 修改
 func (c *PatientApiController) EditPatient() {
 	id, _ := c.GetInt64("id", 0)
 
@@ -1074,7 +1074,7 @@ func (c *PatientApiController) DeleteDialysisSolution() {
 	return
 }
 
-//GetDryWeights 取患者干体重调整铺
+// GetDryWeights 取患者干体重调整铺
 func (c *PatientApiController) GetDryWeights() {
 	page, _ := c.GetInt64("page", 1)
 	limit, _ := c.GetInt64("limit", 10)
@@ -1289,9 +1289,9 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	Remark := ""
 	if dataBody["remark"] != nil && reflect.TypeOf(dataBody["remark"]).String() == "string" {
 		remark, _ := dataBody["remark"].(string)
+
 		Remark = remark
 	}
-
 	var advices []*models.GroupAdvice
 	if dataBody["adviceNames"] == nil || reflect.TypeOf(dataBody["adviceNames"]).String() != "[]interface {}" {
 		utils.ErrorLog("adviceNames")
@@ -1323,6 +1323,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			return
 		}
 		adviceName, _ := adviceNameM["advice_name"].(string)
+		fmt.Println("adviceceNMAE--------------------------------", adviceName)
 		if len(adviceName) == 0 {
 			utils.ErrorLog("len(advice_name) == 0")
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1416,6 +1417,10 @@ func (c *PatientApiController) CreateGroupAdvice() {
 			advice.DrugNameId = drug_name_id
 		}
 
+		remark, _ := adviceNameM["remark"].(string)
+		fmt.Println("哦哦撒搜哦搜搜哦remark-----------------------------------", remark)
+		advice.Remark = remark
+
 		if adviceType == 1 {
 
 			if adviceNameM["frequency_type"] != nil || reflect.TypeOf(adviceNameM["frequency_type"]).String() == "float64" {
@@ -3029,7 +3034,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 	return
 }
 
-//GetDoctorAdvices 医嘱列表
+// GetDoctorAdvices 医嘱列表
 func (c *PatientApiController) GetDoctorAdvices() {
 	id, _ := c.GetInt64("id", 0)
 	adviceType, _ := c.GetInt64("advice_type", 0)

controllers/self_drug_api_congtroller.go

@@ -2716,7 +2716,7 @@ func (this *SelfDrugApiController) GetInventoryModeList() {
 	})
 }
 
-//库存优化接口
+// 库存优化接口
 func (this *SelfDrugApiController) GetStorehouseList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId

models/dialysis.go

@@ -1103,6 +1103,7 @@ type DialysisBeforePrepareGoods struct {
 	PatientId         int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	OrderId           int64  `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	NewCount          int64  `gorm:"column:new_count" json:"new_count" form:"new_count"`
+	OldCount          int64  `gorm:"column:old_count" json:"old_count" form:"old_count"`
 }
 
 type NewDialysisBeforePrepareGoods struct {
@@ -1119,6 +1120,7 @@ type NewDialysisBeforePrepareGoods struct {
 	ChildNewDialysisBeforePrepareGoods []*NewDialysisBeforePrepareGoods `gorm:"ForeignKey:GoodId;AssociationForeignKey:GoodId" json:"child"`
 	PatientId                          int64                            `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	OrderId                            int64                            `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	OldCount                           int64                            `gorm:"column:old_count" json:"old_count" form:"old_count"`
 }
 
 type OldDialysisBeforePrepareGoods struct {

models/patient_models.go

@@ -1818,6 +1818,8 @@ type XtPatientFirstDisease struct {
 	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"`
+	ProjectId             string `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	InspectDate           string `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
 }
 
 func (XtPatientFirstDisease) TableName() string {

service/dialysis_service.go

@@ -1593,7 +1593,7 @@ func GetAllPcAdvicestByList(orgID int64, scheduleDate int64) (advices []*VMDocto
 	advice_list_str, _ := redis.Get(key).Result()
 
 	if len(advice_list_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? ", orgID, scheduleDate).Find(&advices).Error
+		err = readDb.Where("status = 1 AND user_org_id = ? AND advice_type = 2 AND advice_date = ? and id desc ", orgID, scheduleDate).Find(&advices).Error
 		if err != nil {
 			if err == gorm.ErrRecordNotFound {
 				if len(advices) <= 0 {

service/new_warehouse_service.go

@@ -26,8 +26,10 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 	// 如果没有对应的库存，则报错
 
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId)
-	if err != nil {
-		return errors.New("库存数量不足")
+	if goods.Count > 0 {
+		if err != nil {
+			return errors.New("库存数量不足")
+		}
 	}
 
 	stock_number = warehouse.StockCount
@@ -36,6 +38,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 	if stock_number >= deliver_number {
 
 		maxNumber = goods.Count
+
 		//出库
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 		warehouse.Mtime = time.Now().Unix()
@@ -352,7 +355,7 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			warehouseOutInfo.Price = goodsInfo.PackingPrice
 		}
 		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
-		//fmt.Println("errcodes23332322332323223", errcodes, goods.ProjectId)
+
 		if errcodes == gorm.ErrRecordNotFound {
 			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 			if errOne != nil {
@@ -3004,7 +3007,8 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 		if warehouse.StockCount < 0 {
 			return errors.New("库存数量不足")
 		}
-		err := tx.Save(&warehouse).Error
+		var info models.WarehousingInfo
+		err := tx.Model(&info).Where("id = ?", warehouse.ID).Updates(map[string]interface{}{"stock_count": warehouse.StockCount}).Error
 		if err != nil {
 			return err
 		}
@@ -3548,3 +3552,590 @@ func ConsumablesGoodDeliveryFivety(orgID int64, patient_id int64, record_time in
 	}
 	return err
 }
+
+func ConsumablesGoodDeliveryNew(orgID int64, patient_id int64, record_time int64, goods *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut, count int64) (err error) {
+
+	//开事务
+	tx := XTWriteDB().Begin()
+	if err != nil {
+		utils.ErrorLog("事务失败，原因为: %v", err)
+		tx.Rollback()
+	} else {
+		fmt.Println("err-----------------------", err)
+		tx.Commit()
+	}
+	var deliver_number int64 = 0
+	var stock_number int64 = 0
+	var maxNumber int64 = 0
+
+	deliver_number = goods.Count
+
+	// 根据先进先出原则，查询最先入库的批次，进行出库
+	// 如果没有对应的库存，则报错
+
+	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId, goods.StorehouseId)
+	if goods.Count > 0 {
+		if err != nil {
+			return errors.New("库存数量不足")
+		}
+	}
+
+	stock_number = warehouse.StockCount
+
+	// 当库存数量大于或等于出库数量的话，则正常出库该批次
+	if stock_number >= deliver_number {
+
+		maxNumber = goods.Count
+
+		//出库
+		warehouse.StockCount = warehouse.StockCount - maxNumber
+		warehouse.Mtime = time.Now().Unix()
+		if warehouse.StockCount < 0 {
+			return errors.New("库存数量不足")
+		}
+
+		err := tx.Save(&warehouse).Error
+		if err != nil {
+			return err
+		}
+		//更新his_prescripton_project出库状态值
+		UpdateHisPrescriptionProjectStatus(goods.GoodId, record_time, orgID, patient_id)
+
+		var info []*models.WarehousingInfo
+		err = tx.Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0 and storehouse_id = ?", goods.GoodId, orgID, goods.StorehouseId).Find(&info).Error
+		var sum_count int64
+		for _, item := range info {
+			sum_count += item.StockCount
+		}
+
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		warehouseOutInfo.Count = count
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
+		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+		if errcodes == gorm.ErrRecordNotFound {
+			err := tx.Create(&warehouseOutInfo).Error
+			if err != nil {
+				return err
+			}
+		} else if errcodes == nil {
+
+			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
+			if count != outInfoOne.Count {
+
+				outInfo := models.WarehouseOutInfo{}
+				err := tx.Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", goods.GoodId, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": warehouseOutInfo.WarehouseOutId, "WarehouseOutOrderNumber": warehouseOutInfo.WarehouseOutOrderNumber, "sys_record_time": warehouseOutInfo.SysRecordTime, "good_type_id": warehouseOutInfo.GoodTypeId, "patient_id": warehouseOutInfo.PatientId, "consumable_type": warehouseOutInfo.ConsumableType, "count": warehouseOutInfo.Count, "price": warehouseOutInfo.Price, "dealer": warehouseOutInfo.Dealer, "manufacturer": warehouseOutInfo.Manufacturer, "number": warehouseOutInfo.Number, "license_number": warehouseOutInfo.LicenseNumber, "over_count": warehouseOutInfo.OverCount}).Error
+				if err != nil {
+					return err
+				}
+			}
+
+		}
+		lastOut, _ := FindWarehouseOutInfoByPatientId(patient_id, record_time, goods.GoodId, orgID)
+
+		//查询已经出库的数据
+		flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+
+		//查询退库数据
+		flowGoodTwo, _ := GetStockFlowIsBatchNumberThree(patient_id, record_time, goods.GoodId)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+		//如果本次出库数据大于历史出库数据 新增1条流水
+		if count > (out_count - out_count_one) {
+
+			flow := models.VmStockFlow{
+				WarehouseOutId:          warehouseOut.ID,
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   count - out_count + out_count_one,
+				Price:                   warehouse.PackingPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				LicenseNumber:           warehouse.LicenseNumber,
+				IsEdit:                  2,
+				Creator:                 warehouseOut.Creater,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				WarehouseOutDetailId:    lastOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsSys:                   1,
+				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            goods.StorehouseId,
+				OverCount:               sum_count,
+				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err := tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+
+		}
+
+		//如果本次出库数据小于历史出库数据 新增1条退库流水
+
+		if count < (out_count - out_count_one) {
+
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllCancelStockTotal(orgID)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, orgID)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+
+				err := tx.Create(&cancelStock).Error
+				if err != nil {
+					return err
+				}
+			}
+
+			cancel, _ := GetLastCancelStockById(orgID)
+
+			manufacturer, _ := GetManufactureById(warehouse.Manufacturer)
+			deaerler, _ := GetDealerById(warehouse.Dealer)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+
+			err := tx.Create(&cancelStockInfo).Error
+			if err != nil {
+				return err
+			}
+
+			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - out_count_one - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err = tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		details := models.BloodAutomaticReduceDetail{
+			WarehouseOutId:          lastOut.ID,
+			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
+			PatientId:               patient_id,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   time.Now().Unix(),
+			Status:                  1,
+			RecordTime:              record_time,
+			OrgId:                   orgID,
+			GoodId:                  goods.GoodId,
+			GoodTypeId:              goods.GoodTypeId,
+			Count:                   count,
+			ProjectId:               goods.ProjectId,
+			StorehouseId:            goods.StorehouseId,
+		}
+
+		////查询该耗材已经出库的数量
+		_, errcode := GetAutoMaticReduceDetailTwenty(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+		if errcode == gorm.ErrRecordNotFound {
+
+			err := tx.Create(&details).Error
+			if err != nil {
+				return err
+			}
+		} else if errcode == nil {
+
+			detail := models.BloodAutomaticReduceDetail{}
+			err := tx.Model(&detail).Where("org_id = ? and patient_id = ? and record_time = ? and status =1 and good_id = ? and good_type_id = ?", orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId).Updates(map[string]interface{}{"status": 0, "count": 0}).Error
+			if err != nil {
+				return err
+			}
+
+			err = tx.Create(&detail).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		return nil
+	} else {
+
+		// 当刚批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+
+		err := tx.Save(&warehouse).Error
+		if err != nil {
+			return err
+		}
+		var info []*models.WarehousingInfo
+		err = tx.Where("good_id = ? and org_id = ? and is_check =1 and status= 1 and stock_count > 0 and storehouse_id = ?", goods.GoodId, orgID, goods.StorehouseId).Find(&info).Error
+		var sum_count int64
+		for _, item := range info {
+			sum_count += item.StockCount
+		}
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			WarehouseInfotId:        warehouse.ID,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Remark:                  warehouse.Remark,
+			OrgId:                   orgID,
+			Type:                    1,
+			Manufacturer:            warehouse.Manufacturer,
+			Dealer:                  warehouse.Dealer,
+			IsSys:                   1,
+			SysRecordTime:           record_time,
+			GoodTypeId:              goods.GoodTypeId,
+			GoodId:                  goods.GoodId,
+			PatientId:               patient_id,
+			Number:                  warehouse.Number,
+			LicenseNumber:           warehouse.LicenseNumber,
+			Price:                   warehouse.PackingPrice,
+			ExpiryDate:              warehouse.ExpiryDate,
+			ProductDate:             warehouse.ProductDate,
+			ProjectId:               goods.ProjectId,
+			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+			StorehouseId:            goods.StorehouseId,
+			IsCheck:                 1,
+			OverCount:               sum_count,
+			RegisterNumber:          warehouse.RegisterNumber,
+		}
+		warehouseOutInfo.Count = stock_number
+		if orgID == 9671 || orgID == 10265 {
+			goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+			warehouseOutInfo.Price = goodsInfo.PackingPrice
+		}
+		_, errcodes := GetWarehouseOutInfoIsExistOne(goods.GoodId, patient_id, record_time, goods.ProjectId)
+
+		if errcodes == gorm.ErrRecordNotFound {
+
+			errors := tx.Create(warehouseOutInfo).Error
+			if errors != nil {
+				return errors
+			}
+		} else if errcodes == nil {
+			goods.Count = deliver_number - stock_number
+			//更新数量为  该批次剩余数量  + 还有未出的数量
+			warehouseOutInfo.Count = stock_number
+			outInfoOne, _ := GetWarehouseOutInfoIsExistTwo(goods.GoodId, patient_id, record_time, goods.ProjectId)
+			if count != outInfoOne.Count {
+
+				outInfo := models.WarehouseOutInfo{}
+				err := tx.Model(&outInfo).Where("good_id = ? and patient_id = ? and sys_record_time  =? and status = 1", goods.GoodId, patient_id, record_time).Updates(map[string]interface{}{"warehouse_out_id": warehouseOutInfo.WarehouseOutId, "WarehouseOutOrderNumber": warehouseOutInfo.WarehouseOutOrderNumber, "sys_record_time": warehouseOutInfo.SysRecordTime, "good_type_id": warehouseOutInfo.GoodTypeId, "patient_id": warehouseOutInfo.PatientId, "consumable_type": warehouseOutInfo.ConsumableType, "count": warehouseOutInfo.Count, "price": warehouseOutInfo.Price, "dealer": warehouseOutInfo.Dealer, "manufacturer": warehouseOutInfo.Manufacturer, "number": warehouseOutInfo.Number, "license_number": warehouseOutInfo.LicenseNumber, "over_count": warehouseOutInfo.OverCount}).Error
+				if err != nil {
+					return err
+				}
+			}
+
+		}
+		lastOut, _ := FindWarehouseOutInfoByPatientId(patient_id, record_time, goods.GoodId, orgID)
+		//查询该该批次已经出库的数据
+		flowGood, _ := GetStockFlowIsBatchNumber(warehouse.ID, patient_id, record_time, goods.GoodId)
+		var out_count int64
+		var out_count_one int64
+		for _, item := range flowGood {
+			out_count += item.Count
+		}
+		flowGoodTwo, _ := GetStockFlowIsBatchNumberThree(patient_id, record_time, goods.GoodId)
+		for _, item := range flowGoodTwo {
+			out_count_one += item.Count
+		}
+		//如果出库数量 大于 历史出库数据 新增1条流水
+		if count > out_count-out_count_one {
+			flow := models.VmStockFlow{
+				WarehouseOutId:          warehouseOut.ID,
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				Count:                   stock_number,
+				Price:                   warehouse.PackingPrice,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				UserOrgId:               orgID,
+				Manufacturer:            warehouse.Manufacturer,
+				Dealer:                  warehouse.Dealer,
+				LicenseNumber:           warehouse.LicenseNumber,
+				IsEdit:                  2,
+				Creator:                 warehouseOut.Creater,
+				SystemTime:              record_time,
+				ConsumableType:          3,
+				WarehouseOutDetailId:    lastOut.ID,
+				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+				IsSys:                   1,
+				PatientId:               patient_id,
+				ProjectId:               goods.ProjectId,
+				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+				StorehouseId:            goods.StorehouseId,
+				OverCount:               sum_count,
+				BuyPrice:                warehouse.Price,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+
+			err := tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+		//退库
+		if count < out_count-out_count_one {
+			operation_time := time.Now().Unix()
+
+			//创建退库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllCancelStockTotal(orgID)
+			total = total + 1
+			orderNumber := "CKTKD" + strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+			cancelStock := models.CancelStock{
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        orgID,
+				Creater:      warehouseOut.Creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   record_time,
+				Type:         1,
+				StorehouseId: goods.StorehouseId,
+				IsCheck:      1,
+			}
+			_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, orgID)
+			if msgerrkonde == gorm.ErrRecordNotFound {
+
+				err := tx.Create(&cancelStock).Error
+				if err != nil {
+					return err
+				}
+			}
+
+			cancel, _ := GetLastCancelStockById(orgID)
+
+			manufacturer, _ := GetManufactureById(warehouse.Manufacturer)
+			deaerler, _ := GetDealerById(warehouse.Dealer)
+			cancelStockInfo := models.CancelStockInfo{
+				GoodId:          goods.GoodId,
+				CancelStockId:   cancel.ID,
+				GoodTypeId:      goods.GoodTypeId,
+				Count:           out_count - out_count_one - count,
+				Price:           warehouse.PackingPrice,
+				Total:           0,
+				ProductDate:     warehouse.ProductDate,
+				ExpiryDate:      warehouse.ExpiryDate,
+				Ctime:           time.Now().Unix(),
+				Status:          1,
+				OrgId:           orgID,
+				OrderNumber:     cancel.OrderNumber,
+				Type:            0,
+				Dealer:          deaerler.DealerName,
+				Manufacturer:    manufacturer.ManufacturerName,
+				Number:          warehouse.Number,
+				RegisterAccount: "",
+				Remark:          "",
+				WarehouseInfoId: warehouse.ID,
+				PatientId:       patient_id,
+				RecordDate:      record_time,
+				StorehouseId:    goods.StorehouseId,
+				IsCheck:         1,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				cancelStockInfo.Price = goodsInfo.PackingPrice
+			}
+
+			err := tx.Create(&cancelStockInfo).Error
+			if err != nil {
+				return err
+			}
+
+			cancelInfo, _ := GetLastCancelStockInfoByGoodId(goods.GoodId)
+
+			flow := models.VmStockFlow{
+				WarehousingId:           warehouse.ID,
+				GoodId:                  goods.GoodId,
+				Number:                  warehouse.Number,
+				LicenseNumber:           warehouse.LicenseNumber,
+				Count:                   out_count - count,
+				UserOrgId:               orgID,
+				PatientId:               patient_id,
+				SystemTime:              record_time,
+				ConsumableType:          7,
+				IsSys:                   1,
+				WarehousingOrder:        "",
+				WarehouseOutId:          lastOut.WarehouseOutId,
+				WarehouseOutOrderNumber: lastOut.WarehouseOutOrderNumber,
+				IsEdit:                  0,
+				CancelStockId:           cancel.ID,
+				CancelOrderNumber:       cancel.OrderNumber,
+				Manufacturer:            manufacturer.ID,
+				Dealer:                  0,
+				Creator:                 warehouseOut.Creater,
+				UpdateCreator:           0,
+				Status:                  1,
+				Ctime:                   time.Now().Unix(),
+				Mtime:                   0,
+				Price:                   warehouse.PackingPrice,
+				WarehousingDetailId:     warehouse.ID,
+				WarehouseOutDetailId:    lastOut.ID,
+				CancelOutDetailId:       cancelInfo.ID,
+				ProductDate:             warehouse.ProductDate,
+				ExpireDate:              warehouse.ExpiryDate,
+				StorehouseId:            goods.StorehouseId,
+				BuyPrice:                warehouse.Price,
+				ProjectId:               goods.ProjectId,
+				OverCount:               sum_count,
+				RegisterNumber:          warehouse.RegisterNumber,
+			}
+			if orgID == 9671 || orgID == 10265 {
+				goodsInfo, _ := FindeGoodInfo(orgID, goods.ProjectId)
+				flow.Price = goodsInfo.PackingPrice
+				flow.BuyPrice = goodsInfo.BuyPrice
+			}
+			err = tx.Create(&flow).Error
+			if err != nil {
+				return err
+			}
+		}
+
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		goods.Count = deliver_number - stock_number
+
+		ConsumablesGoodDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
+
+	}
+
+	return nil
+}

service/patientmanage_service.go

@@ -1055,7 +1055,7 @@ func GetInspectionDetail(patientid int64, date int64, orgid int64, projectid int
 	if projectid > 0 {
 		db = db.Where("x.project_id = ?", projectid)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.org_id,x.project_id,x.item_id,x.item_name,x.project_name,x.inspect_type,x.inspect_value,x.inspect_date,x.status,x.created_time,x.updated_time,r.range_type,r.range_min,r.range_max,r.range_value,r.range_options,r.unit").Joins("left join xt_inspection_reference as r on (r.item_id = x.item_id AND r.org_id = x.org_id) OR ( x.item_id = r.id AND r.org_id = 0)   ").Scan(&inspection).Error
 	return inspection, err
 }
 
@@ -1948,7 +1948,7 @@ func GetFirstDetailById(id int64) (models.XtPatientFirstDisease, error) {
 
 func UpdatePatientFirstDisease(disease models.XtPatientFirstDisease, id int64) error {
 
-	err := XTWriteDB().Model(&models.XtPatientFirstDisease{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"title": disease.Title, "doctor": disease.Doctor, "record_date": disease.RecordDate, "main_content": disease.MainContent, "patient_case": disease.PatientCase, "tentative_diagnosis": disease.TentativeDiagnosis, "diagnostic_basis": disease.DiagnosticBasis, "differential_diagnosis": disease.DifferentialDiagnosis, "treatment_plan": disease.TreatmentPlan}).Error
+	err := XTWriteDB().Model(&models.XtPatientFirstDisease{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"title": disease.Title, "doctor": disease.Doctor, "record_date": disease.RecordDate, "main_content": disease.MainContent, "patient_case": disease.PatientCase, "tentative_diagnosis": disease.TentativeDiagnosis, "diagnostic_basis": disease.DiagnosticBasis, "differential_diagnosis": disease.DifferentialDiagnosis, "treatment_plan": disease.TreatmentPlan, "project_id": disease.ProjectId, "inspect_date": disease.InspectDate}).Error
 	return err
 }
 

service/stock_service.go

@@ -8508,3 +8508,11 @@ func GetGoodOutOpenConfigOne(user_org_id int64) (models.XtGoodOutConfig, error)
 	err := XTReadDB().Where("user_org_id = ? and status = 1", user_org_id).Find(&config).Error
 	return config, err
 }
+
+func UpdateDeleteAutoGood(good_id int64, record_date int64, patient_id int64) error {
+
+	err := XTWriteDB().Model(&models.AutomaticReduceDetail{}).Where("good_id = ? and record_time = ? and patient_id = ?", good_id, record_date, patient_id).Updates(map[string]interface{}{"status": 1}).Error
+
+	err = XTWriteDB().Model(&models.DialysisBeforePrepare{}).Where("good_id = ? and record_date = ? and patient_id = ?", good_id, record_date, patient_id).Updates(map[string]interface{}{"status": 1}).Error
+	return err
+}

service/warhouse_service.go

@@ -1208,6 +1208,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	//查询该患者当天已经出库的耗材信息
 	goods_yc, _ := FindConsumablesByDateTwo(orgID, patient_id, record_time)
+
 	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
 	for i := len(goods_yc) - 1; i >= 0; i-- {
 		goods_yc_temp := goods_yc[i]
@@ -1244,7 +1245,8 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
 	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
-
+	fmt.Println("len233333333333333w", len(goods_yc))
+	fmt.Println("需要出库的数据", len(goods))
 	if len(goods) > 0 {
 		out, err := FindStockOutByIsSys(orgID, 1, record_time)
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
@@ -1293,15 +1295,15 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 			var cha_count int64
 			var cha_count_two int64
+			//查询已经出库的数量
 			flowGood, _ := GetStockFlowIsBatchNumberTwo(patient_id, record_time, item.GoodId)
 			var out_count int64
 			for _, item := range flowGood {
 				out_count += item.Count
 			}
+			//已经出库的数量 减掉目前需要出库的数据
 			cha_count = item.Count - out_count
-			//fmt.Println("item.Count", item.Count)
-			//fmt.Println("item.Count", out_count)
-			//fmt.Println("cha_count2323223232323223", cha_count)
+
 			cha_count_two = out_count - item.Count
 
 			prepare := models.DialysisBeforePrepare{
@@ -1313,17 +1315,22 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 			}
 
 			ConsumablesGoodDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
+
 			//数量增加
 			if cha_count > 0 {
 				//出库数量累加
 				ModifyGoodSumCount(houseConfig.StorehouseOutInfo, cha_count, orgID, item.GoodId)
 			}
-			//数量减少
+
+			//已经出库的数据 大于 目前需要出库的数据
 			if cha_count_two > 0 {
+
 				ModifyAddGoodSumCount(houseConfig.StorehouseOutInfo, cha_count_two, orgID, item.GoodId)
 				//退库数量增加
 				UpdateSumAddCancelCount(orgID, item.GoodId, houseConfig.StorehouseOutInfo, cha_count_two)
 
+				//生成退库单
+
 			}
 			//更新剩余库存
 			goodListSix, _ := GetSumGoodList(orgID, houseConfig.StorehouseOutInfo, item.GoodId)
@@ -1826,6 +1833,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		if errThree != nil {
 			return errThree
 		}
+		fmt.Println("errThreee23333333333333333333333", errThree)
 		//查询剩余库存
 		houseConfig, _ := GetAllStoreHouseConfig(orgID)
 		goodList, _ := GetAllGoodSumCount(good_yc.GoodId, orgID, houseConfig.StorehouseOutInfo)
@@ -1833,6 +1841,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		for _, item := range goodList {
 			sum_count += item.StockCount
 		}
+		fmt.Println("sum_count++++++++++++++++++++++++++++++++=", sum_count)
 		// 判断当前出库的数据和删除出库数量
 		if good_yc.Count <= ware.Count {
 			delete_count = good_yc.Count
@@ -1902,6 +1911,103 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 		//退库数量相加
 		UpdateSumAddCancelCount(good_yc.UserOrgId, good_yc.GoodId, houseConfig.StorehouseOutInfo, delete_count)
 
+		operation_time := time.Now().Unix()
+		//创建退库单
+		timeStr := time.Now().Format("2006-01-02")
+		timeArr := strings.Split(timeStr, "-")
+		total, _ := FindAllCancelStockTotal(good_yc.UserOrgId)
+		total = total + 1
+		orderNumber := "CKTKD" + strconv.FormatInt(good_yc.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+		cancelStock := models.CancelStock{
+			OrderNumber:  orderNumber,
+			OperaTime:    operation_time,
+			OrgId:        good_yc.UserOrgId,
+			Creater:      warehouseOut.Creater,
+			Ctime:        time.Now().Unix(),
+			Status:       1,
+			ReturnTime:   record_time,
+			Type:         1,
+			StorehouseId: houseConfig.StorehouseOutInfo,
+			IsCheck:      1,
+		}
+		_, msgerrkonde := GetCancelStockDetailByOrderNumberOne(record_time, good_yc.UserOrgId)
+		if msgerrkonde == gorm.ErrRecordNotFound {
+			AddSigleCancelStock(&cancelStock)
+		}
+		cancel, _ := GetLastCancelStockById(good_yc.UserOrgId)
+
+		manufacturer, _ := GetManufactureById(ware.Manufacturer)
+		deaerler, _ := GetDealerById(ware.Dealer)
+
+		cancelStockInfo := models.CancelStockInfo{
+			GoodId:          ware.GoodId,
+			CancelStockId:   cancel.ID,
+			GoodTypeId:      ware.GoodTypeId,
+			Count:           delete_count,
+			Price:           ware.Price,
+			Total:           0,
+			ProductDate:     ware.ProductDate,
+			ExpiryDate:      ware.ExpiryDate,
+			Ctime:           time.Now().Unix(),
+			Status:          1,
+			OrgId:           good_yc.UserOrgId,
+			OrderNumber:     cancel.OrderNumber,
+			Type:            0,
+			Dealer:          deaerler.DealerName,
+			Manufacturer:    manufacturer.ManufacturerName,
+			Number:          ware.Number,
+			RegisterAccount: "",
+			Remark:          "",
+			WarehouseInfoId: ware.WarehouseInfotId,
+			PatientId:       ware.PatientId,
+			RecordDate:      record_time,
+			StorehouseId:    houseConfig.StorehouseOutInfo,
+			IsCheck:         1,
+		}
+
+		CreateCancelStockInfoOne(&cancelStockInfo)
+		cancelInfo, _ := GetLastCancelStockInfoByGoodId(ware.GoodId)
+		goodListOne, _ := GetSumGoodList(good_yc.UserOrgId, houseConfig.StorehouseOutInfo, good_yc.GoodId)
+		var over_count int64
+		for _, it := range goodListOne {
+			over_count += it.StockCount
+		}
+		flow := models.VmStockFlow{
+			WarehousingId:           ware.WarehouseInfotId,
+			GoodId:                  ware.GoodId,
+			Number:                  ware.Number,
+			LicenseNumber:           ware.LicenseNumber,
+			Count:                   ware.Count,
+			UserOrgId:               ware.OrgId,
+			PatientId:               ware.PatientId,
+			SystemTime:              record_time,
+			ConsumableType:          7,
+			IsSys:                   0,
+			WarehousingOrder:        "",
+			WarehouseOutId:          ware.WarehouseOutId,
+			WarehouseOutOrderNumber: ware.WarehouseOutOrderNumber,
+			IsEdit:                  0,
+			CancelStockId:           cancel.ID,
+			CancelOrderNumber:       cancel.OrderNumber,
+			Manufacturer:            manufacturer.ID,
+			Dealer:                  0,
+			Creator:                 warehouseOut.Creater,
+			UpdateCreator:           0,
+			Status:                  1,
+			Ctime:                   time.Now().Unix(),
+			Mtime:                   0,
+			Price:                   ware.Price,
+			WarehousingDetailId:     ware.WarehouseInfotId,
+			WarehouseOutDetailId:    ware.ID,
+			CancelOutDetailId:       cancelInfo.ID,
+			ProductDate:             ware.ProductDate,
+			ExpireDate:              ware.ExpiryDate,
+			StorehouseId:            houseConfig.StorehouseOutInfo,
+			OverCount:               over_count,
+		}
+		CreateStockFlowOne(flow)
+
 		// 增加了对应的库存后，看看还有多少需要退库的
 		good_yc.Count = good_yc.Count - delete_count
 		if good_yc.Count == 0 {
@@ -6044,6 +6150,18 @@ func ModifyReduceGoodSumCount(storehouse_id int64, count int64, user_org_id int6
 	return err
 }
 
+func ModifyReduceGoodSumCountTwenty(storehouse_id int64, count int64, user_org_id int64, good_id int64) error {
+	ut := XTWriteDB().Begin()
+
+	err = ut.Model(&models.XtGoodStockCount{}).Where("storehouse_id = ? and status = 1 and user_org_id  = ? and good_id =?", storehouse_id, user_org_id, good_id).UpdateColumn("stock_out_count", gorm.Expr("stock_out_count - ?", count)).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
+	return err
+}
+
 func ModifyAddGoodSumCount(storehouse_id int64, count int64, user_org_id int64, good_id int64) error {
 	ut := XTWriteDB().Begin()