11月8日库存管理

conf/app.conf

 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

controllers/gobal_config_api_controller.go

 	warehousing, _ := service.GetExportOutOrderDrugListOne(ids)
 
 	drug_warhouse_out, _ := service.GetDrugWarehouseOutTenty(ids, admin.CurrentOrgId)
-
+	fmt.Println("drug_warhouse_out9999999", drug_warhouse_out)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"info":              info,
 		"warehousing":       warehousing,

controllers/his_api_controller.go

 	houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 	if adminInfo.CurrentOrgId == 9675 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10215 {
 		//获取所有基础药
-		drugs, _ := service.GetAllDrugLibListSeven(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
+		drugs, _ := service.GetAllDrugLibListSix(adminInfo.CurrentOrgId, houseConfig.DrugStorehouseOut)
 		_, config := service.FindHisStockPriceRecordByOrgId(adminInfo.CurrentOrgId)
 		if config.ID > 0 && config.IsOpen == 1 {
 			for _, item := range drugs {
 								var drug_id int64
 								var prescribing_number float64
 								var prescribingNumberUnit string
-								var prescribingNumber string
+								//var prescribingNumber string
 
 								var adviceId int64
 								if advice.(map[string]interface{})["id"] != nil || reflect.TypeOf(advice.(map[string]interface{})["id"]).String() == "float64" {
 								if advice.(map[string]interface{})["prescribing_number"] != nil || reflect.TypeOf(advice.(map[string]interface{})["prescribing_number"]).String() == "string" {
 									prescribing_number_str := advice.(map[string]interface{})["prescribing_number"].(string)
 									prescribing_number, _ = strconv.ParseFloat(prescribing_number_str, 64)
-									prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
+									//prescribingNumber = advice.(map[string]interface{})["prescribing_number"].(string)
 								}
 
 								if advice.(map[string]interface{})["prescribing_number_unit"] != nil && reflect.TypeOf(advice.(map[string]interface{})["prescribing_number_unit"]).String() == "string" {
 									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 									return
 								}
+								//查询默认出库仓库库存
+								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
 								//查询药品的所有库存
-								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId)
+								list, _ := service.GetDrugWarehouseInfoPrescriptionSeven(drug_id, adminInfo.CurrentOrgId, storeConfig.DrugStorehouseOut)
 								var total_count int64
 								for _, it := range list {
 									total_count += it.StockMaxNumber*drug.MinNumber + it.StockMinNumber
 								totals := strconv.FormatInt(total_count, 10)
 								//查询该药品是否存在开药记录
 								advicelist, _ := service.GetHisAdviceListByDrugIdEight(drug_id, patient_id, recordDateTime, adviceId)
-
+								fmt.Println("advicleise23223323233223w", advicelist.PrescribingNumber)
 								//新增处方
 								if advicelist.ID == 0 {
 									all_count, _ := strconv.ParseFloat(totals, 64)
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											return
 										}
-									} else {
-										if prescribingNumberUnit == drug.MaxUnit {
-											num := prescribing_number * float64(drug.MinNumber)
-											if num > all_count {
-												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
-												return
-											}
-										}
-									}
-								}
-								//修改处方
-								if advicelist.ID > 0 {
-									var device_number int64
 
-									if advicelist.PrescribingNumberUnit == drug.MaxUnit {
-										prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
-										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
-										device_number = prescribingNumberInt * drug.MinNumber
 									}
-									if advicelist.PrescribingNumberUnit == drug.MinUnit {
-										prescribingNumberOne := strconv.FormatFloat(advicelist.PrescribingNumber, 'f', -1, 64)
-										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumberOne, 10, 64)
-										device_number = prescribingNumberInt
-									}
-
-									var number_count int64
 									if prescribingNumberUnit == drug.MaxUnit {
-										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-										number_count = prescribingNumberInt * drug.MinNumber
-									}
-									if prescribingNumberUnit == drug.MinUnit {
-										prescribingNumberInt, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-										number_count = prescribingNumberInt
-									}
-
-									//如果修改的数量大于之前修改的数量
-									if (number_count - device_number) > 0 {
-										//如果修改的差数量 大于库存数量
-										if (number_count - device_number) > total_count {
+										num := prescribing_number * float64(drug.MinNumber)
+										if num > all_count {
 											c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 											return
 										}
 									}
 
-									if device_number != number_count {
-
-										// 查询该药品最后一次出库记录
-										druginfo, _ := service.GetLastDrugWarehouseOutByDrugId(drug_id, patient_id, recordDateTime, adviceId)
-
-										//回退库存
-										if druginfo.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
-											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, number_count)
-										}
-										if druginfo.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-											var stock_max_number int64
-											var stock_min_number int64
-
-											if number_count >= drug.MinNumber {
-
-												stock_max_number = device_number / drug.MinNumber
-												service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, stock_max_number)
-												stock_min_number = device_number % drug.MinNumber
-												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, stock_min_number)
-
-											} else {
-
-												service.ModefyDrugByWarehouseInfoOne(druginfo.WarehouseInfoId, device_number)
-											}
-										}
-
-										if druginfo.CountUnit == drug.MaxUnit && druginfo.CountUnit == drug.MinUnit && drug.MaxUnit == drug.MinUnit {
-											service.ModefyDrugByWarehouseInfo(druginfo.WarehouseInfoId, device_number)
-										}
-										//删除记录
-										service.DeleteDrugAutoWarehouseSeven(drug_id, patient_id, recordDateTime, adviceId)
-									}
 								}
+								//修改处方
+								//if advicelist.ID > 0 {
+								//all_count, _ := strconv.ParseFloat(totals, 64) //总库存
+								//var  his_count int64 //历史出库数据
+								//if(advicelist.PrescribingNumberUnit == drug.MaxUnit){
+								//  strPrescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'E', -1, 64)
+								//  intPrescribingNumber, _ := strconv.ParseInt(strPrescribingNumber, 10, 64)
+								//  his_count = intPrescribingNumber * drug.MinNumber
+								//}
+								//if(advicelist.PrescribingNumberUnit == drug.MinUnit){
+								//  strPrescribingNumber := strconv.FormatFloat(advicelist.PrescribingNumber, 'E', -1, 64)
+								//  intPrescribingNumber, _ := strconv.ParseInt(strPrescribingNumber, 10, 64)
+								//  his_count = intPrescribingNumber
+								//}
+								//
+								//
+								// if prescribingNumberUnit == drug.MinUnit {
+								//
+								//   float_prescribing_number := strconv.FormatFloat(prescribing_number, 'f', -1, 64)
+								//   int_prescribing_number, _ := strconv.ParseInt(float_prescribing_number, 10, 64)
+								//   float_all_count := strconv.FormatFloat(all_count, 'f', -1, 64)
+								//   int_all_count, _ := strconv.ParseInt(float_all_count, 10, 64)
+								//
+								//   fmt.Println("总库存我的",int_all_count)
+								//   fmt.Println("现在出库库存",int_prescribing_number)
+								//   fmt.Println("历史出库数据",his_count)
+								//   if (int_prescribing_number - his_count) > int_all_count {
+								//     c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+								//     return
+								//   }
+								//
+								// }
+								// if prescribingNumberUnit == drug.MaxUnit {
+								//   float_all_count := strconv.FormatFloat(all_count, 'f', -1, 64)
+								//   int_all_count, _ := strconv.ParseInt(float_all_count, 10, 64)
+								//   num := prescribing_number * float64(drug.MinNumber)
+								//   num_str_count := strconv.FormatFloat(num, 'f', -1, 64)
+								//   num_int_count, _ := strconv.ParseInt(num_str_count, 10, 64)
+								//   fmt.Println("总库存我的",int_all_count)
+								//   fmt.Println("现在出库库存",num_str_count)
+								//   fmt.Println("历史出库数据",his_count)
+								//   if (num_int_count - his_count)  > int_all_count {
+								//     c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
+								//     return
+								//   }
+								// }
+								//}
+
 							}
 						}
 					}
 
 									//查找该耗材的出库记录
 									goodWarehouseInfo, _ := service.GetAutoRecordByGoodIdSevenEight(project_id, patient_id, recordDateTime)
-									//var total_count int64
-									//for _, it := range goodWarehouseInfo {
-									//	total_count += it.Count
-									//}
 
 									if len(goodWarehouseInfo) == 0 {
 										//查询耗材库存
 				//更改患者挂号状态
 				_, err2 := service.UpdateHisPatientIsReturn(patient_id, recordDateTime, adminInfo.CurrentOrgId)
 				fmt.Println("更改失败", err2)
+
 				if items["advices"] != nil && reflect.TypeOf(items["advices"]).String() == "[]interface {}" {
 					advices := items["advices"].([]interface{})
 					//group := service.GetMaxAdviceGroupID(adminInfo.CurrentOrgId)
 							}
 
 							s.StartTime = pTime
+							var total_count int64 //处方总库存
+							//查询改药品信息
+							medical, _ := service.GetBaseDrugMedical(s.DrugId)
+							prescribingNumberSix := strconv.FormatFloat(s.PrescribingNumber, 'f', -1, 64)
+							prescribingNumberSeven, _ := strconv.ParseInt(prescribingNumberSix, 10, 64)
+
+							if s.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit != medical.MinUnit {
+								total_count += prescribingNumberSeven * medical.MinNumber
+							}
+
+							if s.PrescribingNumberUnit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
+								total_count += prescribingNumberSeven
+							}
+
+							if s.PrescribingNumberUnit == medical.MaxUnit && medical.MaxUnit == medical.MinUnit {
+								total_count += prescribingNumberSeven
+							}
 							service.CreateHisDoctorAdvice(&s)
 
 							//存储切片中
 							keyEight := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 							redis.Set(keyEight, "", time.Second)
 							defer redis.Close()
+
 						}
 					}
+
 				}
 				if items["project"] != nil && reflect.TypeOf(items["project"]).String() == "[]interface {}" {
 					projects := items["project"].([]interface{})
 				//}
 
 			}
+
+		}
+
+		//查询今日该患者开的药品处方
+		hisdoctorlist, _ := service.GetHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId)
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
+		for _, item := range hisdoctorlist {
+			drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
+
+			// 查询该药品最后一次出库记录
+			druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
+			fmt.Println("drugiNfo23323233232323233223", len(druginfo))
+
+			if len(druginfo) > 0 {
+				//回退库存
+				for _, it := range druginfo {
+					fmt.Println("it", it.Count)
+					fmt.Println("countuntit", it.CountUnit)
+					if it.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+						service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+					}
+					if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+						service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+					}
+					if it.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+						service.ModifyDrugWarehouseInfoStockMaxNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
+					}
+				}
+			}
+
+			//删除记录
+			service.DeleteDrugAutoWarehouseSeven(item.DrugId, patient_id, recordDateTime, item.ID)
+			if drugOutConfig.IsOpen == 1 {
+				//出库
+				if drug.IsUse == 2 {
+					creater := adminInfo.AdminUser.Id
+					service.HisDrugsDelivery(item.UserOrgId, creater, item)
+				}
+
+				//更新字典里面的库存
+				stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+				var sum_count int64
+				for _, its := range stockInfo {
+					sum_count += its.StockMaxNumber*drug.MinNumber + its.StockMinNumber
+				}
+				service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+			}
 		}
 	}
 
 						ReturnTime:   item.RecordDate,
 						Type:         1,
 						StorehouseId: houseConfig.StorehouseOutInfo,
+						IsCheck:      1,
 					}
 					_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(item.RecordDate, c.GetAdminUserInfo().CurrentOrgId)
 					if msgerrkonde == gorm.ErrRecordNotFound {
 							PatientId:       info.PatientId,
 							RecordDate:      info.SysRecordTime,
 							StorehouseId:    houseConfig.StorehouseOutInfo,
+							IsCheck:         1,
 						}
 
 						service.CreateCancelStockInfoOne(&cancelStockInfo)
 									Type:                    1,
 									IsSys:                   1,
 									StorehouseId:            houseConfig.StorehouseOutInfo,
+									IsCheck:                 1,
 								}
 								err := service.AddSigleWarehouseOut(&warehouseOut)
 								if err != nil {
 		err := service.DelelteHisPrescription(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
 		fmt.Println(err)
 	}
+	err := service.DelelteHisPrescription(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
+	fmt.Println(err)
+	if len(advices) > 0 {
+		for _, item := range advices {
+			redis := service.RedisClient()
+			keyFive := strconv.FormatInt(item.UserOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
+			redis.Set(keyFive, "", time.Second)
+			keyOne := strconv.FormatInt(item.UserOrgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
+			redis.Set(keyOne, "", time.Second)
+			redis.Close()
 
+		}
+	}
 	if drugStockConfig.IsOpen == 1 {
-		err := service.DelelteHisPrescription(prescription_id, c.GetAdminUserInfo().CurrentOrgId)
-		fmt.Println(err)
 		if len(advices) > 0 {
-
 			for _, item := range advices {
-				drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, item.DrugId)
-				redis := service.RedisClient()
-
-				keyFive := strconv.FormatInt(item.UserOrgId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_advices_list_all"
-				redis.Set(keyFive, "", time.Second)
-				keyOne := strconv.FormatInt(item.UserOrgId, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":his_doctor_advice"
-				redis.Set(keyOne, "", time.Second)
-				redis.Close()
-
-				//查询该药品是否存在出库记录
-				info, errcode := service.GetDrugAutoWarehouseOutSeven(item.PatientId, item.AdviceDate, item.DrugId, item.ID)
-
-				if errcode == gorm.ErrRecordNotFound {
-
-				} else if errcode == nil {
-					if item.PrescribingNumberUnit == drug.MinUnit {
-
-						floatPrescrip := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 32)
-						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
-
-						//退库
-						warehouseInfo := models.DrugWarehouseInfo{
-							StockMinNumber: prescribingNumber,
-						}
-
-						service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
-
-						adminUserInfo := c.GetAdminUserInfo()
-						operation_time := time.Now().Unix()
-						creater := adminUserInfo.AdminUser.Id
-
-						ctime := time.Now().Unix()
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
-						total = total + 1
-						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-						houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
-						cancelStock := models.DrugCancelStock{
-							OrderNumber:  orderNumber,
-							OperaTime:    operation_time,
-							OrgId:        adminUserInfo.CurrentOrgId,
-							Creater:      creater,
-							Ctime:        ctime,
-							Status:       1,
-							ReturnTime:   item.AdviceDate,
-							Dealer:       info.Dealer,
-							Manufacturer: info.Manufacturer,
-							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
-						}
-						service.AddSigleDrugCancelStock(&cancelStock)
-
-						manufactureName, _ := service.GetManufactureById(info.Manufacturer)
-						dealer, _ := service.GetDealerById(info.Dealer)
-						cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
-						cancelStockInfo := models.DrugCancelStockInfo{
-							OrderNumber:      cancelInfo.OrderNumber,
-							CancelStockId:    cancelInfo.ID,
-							DrugId:           info.DrugId,
-							Count:            prescribingNumber,
-							Status:           1,
-							Ctime:            ctime,
-							OrgId:            adminUserInfo.CurrentOrgId,
-							Type:             1,
-							Manufacturer:     manufactureName.ManufacturerName,
-							Dealer:           dealer.DealerName,
-							Total:            0,
-							RetailPrice:      info.RetailPrice,
-							RetailTotalPrice: info.RetailTotalPrice,
-							Price:            info.Price,
-							RegisterAccount:  "",
-							Remark:           info.Remark,
-							BatchNumber:      info.BatchNumber,
-							MaxUnit:          info.CountUnit,
-							ProductDate:      info.ProductDate,
-							ExpiryDate:       info.ExpiryDate,
-							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
-						}
-
-						flow := models.DrugFlow{
-							WarehousingId:           0,
-							DrugId:                  info.DrugId,
-							Number:                  "",
-							BatchNumber:             info.BatchNumber,
-							Count:                   prescribingNumber,
-							UserOrgId:               adminUserInfo.CurrentOrgId,
-							PatientId:               0,
-							SystemTime:              info.SysRecordTime,
-							ConsumableType:          7,
-							IsSys:                   0,
-							WarehousingOrder:        "",
-							WarehouseOutId:          0,
-							WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-							IsEdit:                  0,
-							CancelStockId:           cancelStock.ID,
-							CancelOrderNumber:       cancelStock.OrderNumber,
-							Manufacturer:            info.Manufacturer,
-							Dealer:                  info.Dealer,
-							Creator:                 adminUserInfo.AdminUser.Id,
-							UpdateCreator:           0,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   0,
-							Price:                   info.Price,
-							WarehousingDetailId:     0,
-							WarehouseOutDetailId:    0,
-							CancelOutDetailId:       0,
-							ExpireDate:              info.ExpiryDate,
-							ProductDate:             info.ProductDate,
-							MaxUnit:                 info.CountUnit,
-							MinUnit:                 "",
-							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
-						}
-						service.CreatedCancelStock(cancelStockInfo)
-						service.CreateDrugFlowOne(flow)
-
-						//删除出库记录
-						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, item.ID)
-						//删除流水
-						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
-					} else {
-						houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
-						floatPrescrip := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 32)
-
-						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
-
-						if item.PrescribingNumberUnit == drug.MaxUnit {
-							warehouseInfo := models.DrugWarehouseInfo{
-								StockMaxNumber: prescribingNumber,
-							}
-							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-
-						}
-
-						adminUserInfo := c.GetAdminUserInfo()
-						operation_time := time.Now().Unix()
-						creater := adminUserInfo.AdminUser.Id
-
-						ctime := time.Now().Unix()
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
-						total = total + 1
-						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
-						cancelStock := models.DrugCancelStock{
-							OrderNumber:  orderNumber,
-							OperaTime:    operation_time,
-							OrgId:        adminUserInfo.CurrentOrgId,
-							Creater:      creater,
-							Ctime:        ctime,
-							Status:       1,
-							ReturnTime:   item.AdviceDate,
-							Dealer:       info.Dealer,
-							Manufacturer: info.Manufacturer,
-							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
-						}
-						service.AddSigleDrugCancelStock(&cancelStock)
-
-						manufactureName, _ := service.GetManufactureById(info.Manufacturer)
-						dealer, _ := service.GetDealerById(info.Dealer)
-						cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
-						cancelStockInfo := models.DrugCancelStockInfo{
-							OrderNumber:   cancelInfo.OrderNumber,
-							CancelStockId: cancelInfo.ID,
-							DrugId:        info.DrugId,
-							//	Count:            info.Count,
-							Count:            prescribingNumber,
-							Status:           1,
-							Ctime:            ctime,
-							OrgId:            adminUserInfo.CurrentOrgId,
-							Type:             1,
-							Manufacturer:     manufactureName.ManufacturerName,
-							Dealer:           dealer.DealerName,
-							Total:            0,
-							RetailPrice:      info.RetailPrice,
-							RetailTotalPrice: info.RetailTotalPrice,
-							Price:            info.Price,
-							RegisterAccount:  "",
-							Remark:           info.Remark,
-							BatchNumber:      info.BatchNumber,
-							MaxUnit:          info.CountUnit,
-							ProductDate:      info.ProductDate,
-							ExpiryDate:       info.ExpiryDate,
-							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
-						}
-
-						flow := models.DrugFlow{
-							WarehousingId: 0,
-							DrugId:        info.DrugId,
-							Number:        "",
-							BatchNumber:   info.BatchNumber,
-							//Count:                   info.Count,
-							Count:                   prescribingNumber,
-							UserOrgId:               adminUserInfo.CurrentOrgId,
-							PatientId:               0,
-							SystemTime:              info.SysRecordTime,
-							ConsumableType:          7,
-							IsSys:                   0,
-							WarehousingOrder:        "",
-							WarehouseOutId:          0,
-							WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-							IsEdit:                  0,
-							CancelStockId:           cancelStock.ID,
-							CancelOrderNumber:       cancelStock.OrderNumber,
-							Manufacturer:            info.Manufacturer,
-							Dealer:                  info.Dealer,
-							Creator:                 adminUserInfo.AdminUser.Id,
-							UpdateCreator:           0,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   0,
-							Price:                   info.Price,
-							WarehousingDetailId:     0,
-							WarehouseOutDetailId:    0,
-							CancelOutDetailId:       0,
-							ExpireDate:              info.ExpiryDate,
-							ProductDate:             info.ProductDate,
-							MaxUnit:                 info.CountUnit,
-							MinUnit:                 "",
-							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
-						}
-						service.CreatedCancelStock(cancelStockInfo)
-						service.CreateDrugFlowOne(flow)
-						//删除出库记录
-						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, item.ID)
-						//删除流水
-						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
-
-					}
-				}
-
-				if item.PrescribingNumberUnit == drug.MinUnit {
-					drug.Total = drug.Total + item.PrescribingNumber
-					service.UpdateBaseDrugLib(&drug)
-				} else {
-					if item.PrescribingNumberUnit == drug.MaxUnit {
-						item.PrescribingNumber = item.PrescribingNumber * float64(drug.MinNumber)
-						drug.Total = drug.Total + item.PrescribingNumber
-						service.UpdateBaseDrugLib(&drug)
-					}
-				}
-
+				creater := c.GetAdminUserInfo().AdminUser.Id
+				service.DrugAutoAddCancelInfo(item, creater)
 			}
 		}
 	}
 	defer redis.Close()
 	if err == nil {
 		if drugStockConfig.IsOpen == 1 {
-			//判断该医嘱是否执行了
-			if advice.ExecutionState == 1 {
-
-				//查询该病人该药品是否有库存记录
-				info, errcode := service.GetDrugAutoWarehouseOutSeven(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
-				if errcode == gorm.ErrRecordNotFound {
 
-				} else {
-					//退库
-					drug, _ := service.FindBaseDrugLibRecord(c.GetAdminUserInfo().CurrentOrgId, advice.DrugId)
-					if advice.PrescribingNumberUnit == drug.MinUnit {
+			//查询是否在处方中出库
+			openConfig, _ := service.GetDrugOpenConfig(c.GetAdminUserInfo().CurrentOrgId)
+			if openConfig.IsOpen != 1 {
 
-						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
-						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
-
-						//退库
-						warehouseInfo := models.DrugWarehouseInfo{
-							StockMinNumber: prescribingNumber,
-						}
-
-						service.UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
-
-						adminUserInfo := c.GetAdminUserInfo()
-						operation_time := time.Now().Unix()
-						creater := adminUserInfo.AdminUser.Id
-
-						ctime := time.Now().Unix()
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
-						total = total + 1
-						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-						houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-						cancelStock := models.DrugCancelStock{
-							OrderNumber:  orderNumber,
-							OperaTime:    operation_time,
-							OrgId:        adminUserInfo.CurrentOrgId,
-							Creater:      creater,
-							Ctime:        ctime,
-							Status:       1,
-							ReturnTime:   advice.AdviceDate,
-							Dealer:       info.Dealer,
-							Manufacturer: info.Manufacturer,
-							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
-						}
-						service.AddSigleDrugCancelStock(&cancelStock)
-
-						manufactureName, _ := service.GetManufactureById(info.Manufacturer)
-						dealer, _ := service.GetDealerById(info.Dealer)
-						cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
-						cancelStockInfo := models.DrugCancelStockInfo{
-							OrderNumber:      cancelInfo.OrderNumber,
-							CancelStockId:    cancelInfo.ID,
-							DrugId:           info.DrugId,
-							Count:            info.Count,
-							Status:           1,
-							Ctime:            ctime,
-							OrgId:            adminUserInfo.CurrentOrgId,
-							Type:             1,
-							Manufacturer:     manufactureName.ManufacturerName,
-							Dealer:           dealer.DealerName,
-							Total:            0,
-							RetailPrice:      info.RetailPrice,
-							RetailTotalPrice: info.RetailTotalPrice,
-							Price:            info.Price,
-							RegisterAccount:  "",
-							Remark:           info.Remark,
-							BatchNumber:      info.BatchNumber,
-							MaxUnit:          info.CountUnit,
-							ProductDate:      info.ProductDate,
-							ExpiryDate:       info.ExpiryDate,
-							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
-						}
-
-						flow := models.DrugFlow{
-							WarehousingId:           0,
-							DrugId:                  info.DrugId,
-							Number:                  "",
-							BatchNumber:             info.BatchNumber,
-							Count:                   info.Count,
-							UserOrgId:               adminUserInfo.CurrentOrgId,
-							PatientId:               0,
-							SystemTime:              info.SysRecordTime,
-							ConsumableType:          7,
-							IsSys:                   0,
-							WarehousingOrder:        "",
-							WarehouseOutId:          0,
-							WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-							IsEdit:                  0,
-							CancelStockId:           cancelStock.ID,
-							CancelOrderNumber:       cancelStock.OrderNumber,
-							Manufacturer:            info.Manufacturer,
-							Dealer:                  info.Dealer,
-							Creator:                 adminUserInfo.AdminUser.Id,
-							UpdateCreator:           0,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   0,
-							Price:                   info.Price,
-							WarehousingDetailId:     0,
-							WarehouseOutDetailId:    0,
-							CancelOutDetailId:       0,
-							ExpireDate:              info.ExpiryDate,
-							ProductDate:             info.ProductDate,
-							MaxUnit:                 info.CountUnit,
-							MinUnit:                 "",
-							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
-						}
-						service.CreatedCancelStock(cancelStockInfo)
-						service.CreateDrugFlowOne(flow)
-
-						//删除出库记录
-						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID)
-						//删除流水
-						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
-					} else {
-						adminUserInfo := c.GetAdminUserInfo()
-						houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
-						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
-
-						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
-
-						if advice.PrescribingNumberUnit == drug.MaxUnit {
-							warehouseInfo := models.DrugWarehouseInfo{
-								StockMaxNumber: prescribingNumber,
-							}
-							service.UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
-
-						}
-
-						operation_time := time.Now().Unix()
-						creater := adminUserInfo.AdminUser.Id
-
-						ctime := time.Now().Unix()
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
-						total = total + 1
-						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
-						cancelStock := models.DrugCancelStock{
-							OrderNumber:  orderNumber,
-							OperaTime:    operation_time,
-							OrgId:        adminUserInfo.CurrentOrgId,
-							Creater:      creater,
-							Ctime:        ctime,
-							Status:       1,
-							ReturnTime:   advice.AdviceDate,
-							Dealer:       info.Dealer,
-							Manufacturer: info.Manufacturer,
-							Type:         1,
-							StorehouseId: houseConfig.DrugStorehouseOut,
-						}
-						service.AddSigleDrugCancelStock(&cancelStock)
-
-						manufactureName, _ := service.GetManufactureById(info.Manufacturer)
-						dealer, _ := service.GetDealerById(info.Dealer)
-						cancelInfo, _ := service.GetLastDrugCancelStockById(adminUserInfo.CurrentOrgId)
-						cancelStockInfo := models.DrugCancelStockInfo{
-							OrderNumber:      cancelInfo.OrderNumber,
-							CancelStockId:    cancelInfo.ID,
-							DrugId:           info.DrugId,
-							Count:            info.Count,
-							Status:           1,
-							Ctime:            ctime,
-							OrgId:            adminUserInfo.CurrentOrgId,
-							Type:             1,
-							Manufacturer:     manufactureName.ManufacturerName,
-							Dealer:           dealer.DealerName,
-							Total:            0,
-							RetailPrice:      info.RetailPrice,
-							RetailTotalPrice: info.RetailTotalPrice,
-							Price:            info.Price,
-							RegisterAccount:  "",
-							Remark:           info.Remark,
-							BatchNumber:      info.BatchNumber,
-							MaxUnit:          info.CountUnit,
-							ProductDate:      info.ProductDate,
-							ExpiryDate:       info.ExpiryDate,
-							BatchNumberId:    info.WarehouseInfoId,
-							StorehouseId:     houseConfig.DrugStorehouseOut,
-						}
-
-						flow := models.DrugFlow{
-							WarehousingId:           0,
-							DrugId:                  info.DrugId,
-							Number:                  "",
-							BatchNumber:             info.BatchNumber,
-							Count:                   info.Count,
-							UserOrgId:               adminUserInfo.CurrentOrgId,
-							PatientId:               0,
-							SystemTime:              info.SysRecordTime,
-							ConsumableType:          7,
-							IsSys:                   0,
-							WarehousingOrder:        "",
-							WarehouseOutId:          0,
-							WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
-							IsEdit:                  0,
-							CancelStockId:           cancelStock.ID,
-							CancelOrderNumber:       cancelStock.OrderNumber,
-							Manufacturer:            info.Manufacturer,
-							Dealer:                  info.Dealer,
-							Creator:                 adminUserInfo.AdminUser.Id,
-							UpdateCreator:           0,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Mtime:                   0,
-							Price:                   info.Price,
-							WarehousingDetailId:     0,
-							WarehouseOutDetailId:    0,
-							CancelOutDetailId:       0,
-							ExpireDate:              info.ExpiryDate,
-							ProductDate:             info.ProductDate,
-							MaxUnit:                 info.CountUnit,
-							MinUnit:                 "",
-							AdviceId:                info.AdviceId,
-							StorehouseId:            houseConfig.DrugStorehouseOut,
-						}
-						service.CreatedCancelStock(cancelStockInfo)
-						service.CreateDrugFlowOne(flow)
-						//删除出库记录
-						service.UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID)
-						//删除流水
-						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
-
-					}
+				//判断该医嘱是否执行了
+				if advice.ExecutionState == 1 {
+					creater := c.GetAdminUserInfo().AdminUser.Id
+					service.DrugAutoAddCancelInfo(&advice, creater)
 				}
 			}
 
+			//开启保存处方扣减功能
+			if openConfig.IsOpen == 1 {
+				creater := c.GetAdminUserInfo().AdminUser.Id
+				service.DrugAutoAddCancelInfo(&advice, creater)
+
+			}
 		}
 
 		c.ServeSuccessJSON(map[string]interface{}{
 			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
 			fmt.Println(err)
 		}
+
 		if project.Type == 3 {
 			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)
-			good.Total = good.Total + f_count
-			service.UpdateGoodInfo(&good)
 
 			operation_time := time.Now().Unix()
 			creater := adminInfo.AdminUser.Id
 					}
 
 				}
+
+				stockList, _ := service.GetStockCountByGoodId(project.ProjectId, houseConfig.StorehouseOutInfo, project.UserOrgId)
+				var total_count_one int64
+				for _, it := range stockList {
+					total_count_one += it.StockCount
+				}
+				//基础库插入数据
+				service.UpdateGoodInfoSumCount(project.ProjectId, total_count_one, project.UserOrgId)
 			}
 			err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
 			fmt.Println(err)

controllers/mobile_api_controllers/check_weight_api_controller.go

 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 || template.TemplateId == 40 || template.TemplateId == 38 || template.TemplateId == 43 || template.TemplateId == 46 || template.TemplateId == 48 || adminUserInfo.Org.Id == 10345 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

 
 		//查询是否有库存
 		for _, item := range dialysisBefor {
-			fmt.Println("houseconfig233232323232232332323223233", houseConfig.StorehouseOutInfo)
 			_, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId, houseConfig.StorehouseOutInfo)
 
 			if err == gorm.ErrRecordNotFound {
 			}
 		}
 
-		//fmt.Println("dialysisBefor9999999999999999999", dialysisBefor, active)
-
 		//新增
 		if active == 1 && len(goods) > 0 {
 			for _, item := range dialysisBefor {
 				service.DeleteDialysisBefor(adminUser.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 				err = service.CreateDialysisBeforePrepareOne(&dialyPrepareOne)
 				//查询默认仓库
-				houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-				goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
-				var sum_count int64
-				var sum_in_count int64
-				for _, it := range goodList {
-					sum_count += it.StockCount
-					sum_in_count += it.WarehousingCount
+				//houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+				//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+				//var sum_count int64
+				//var sum_in_count int64
+				//for _, it := range goodList {
+				//	sum_count += it.StockCount
+				//	sum_in_count += it.WarehousingCount
+				//}
+				//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+				//查询默认仓库
+				storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+				stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminUser.Org.Id)
+				var total_count int64
+				for _, it := range stockList {
+					total_count += it.StockCount
 				}
-				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+				//基础库插入数据
+				service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminUser.Org.Id)
+
 			}
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 
 							service.CreateDialysisBeforePrepareOne(&prepare)
 							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range goodList {
-								sum_count += it.StockCount
-								sum_in_count += it.WarehousingCount
+							//houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+							//var sum_count int64
+							//var sum_in_count int64
+							//for _, it := range goodList {
+							//	sum_count += it.StockCount
+							//	sum_in_count += it.WarehousingCount
+							//}
+							//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+
+							storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminUser.Org.Id)
+							var total_count int64
+							for _, it := range stockList {
+								total_count += it.StockCount
 							}
-							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+							//基础库插入数据
+							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminUser.Org.Id)
 						}
 					}
 
 
 							service.CreateDialysisBeforePrepareOne(&prepare)
 							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range goodList {
-								sum_count += it.StockCount
-								sum_in_count += it.WarehousingCount
+							//houseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminUser.Org.Id)
+							//var sum_count int64
+							//var sum_in_count int64
+							//for _, it := range goodList {
+							//	sum_count += it.StockCount
+							//	sum_in_count += it.WarehousingCount
+							//}
+							//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+							storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUser.Org.Id)
+							stockList, _ := service.GetStockCountByGoodId(item.GoodId, storeHouseConfig.StorehouseOutInfo, adminUser.Org.Id)
+							var total_count int64
+							for _, it := range stockList {
+								total_count += it.StockCount
 							}
-							service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminUser.Org.Id)
+							//基础库插入数据
+							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminUser.Org.Id)
 						}
 						if err != nil {
 							goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 				Type:                    1,
 				IsSys:                   1,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			err := service.AddSigleWarehouseOut(&warehouseOut)
 			if err != nil {
 					//清空准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)
+
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-					var sum_count int64
-					var sum_in_count int64
-					for _, it := range goodList {
-						sum_count += it.StockCount
-						sum_in_count += it.WarehousingCount
+					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.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+					//基础库插入数据
+					service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 				}
 			}
 			//
 					//清空准备表数据
 					service.DeleteDialysisBefor(adminInfo.Org.Id, patient_id, record_time, item.GoodId, item.GoodTypeId)
 					service.CreateDialysisBeforePrepareOne(&prepare)
+
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-					var sum_count int64
-					var sum_in_count int64
-					for _, it := range goodList {
-						sum_count += it.StockCount
-						sum_in_count += it.WarehousingCount
+					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.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+					//基础库插入数据
+					service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 
 				}
 			}
 					if item.Count < goodInfo.Count {
 						//出库
 						err = ConsumablesDeliveryTotalSeven(adminInfo.Org.Id, patient_id, record_time, beforePrepares, adminInfo.AdminUser.Id, item.Count)
-						houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-						goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-						var sum_count int64
-						var sum_in_count int64
-						for _, it := range goodList {
-							sum_count += it.StockCount
-							sum_in_count += it.WarehousingCount
+						//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+						//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+						//var sum_count int64
+						//var sum_in_count int64
+						//for _, it := range goodList {
+						//	sum_count += it.StockCount
+						//	sum_in_count += it.WarehousingCount
+						//}
+						//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+
+						//查询默认仓库
+						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.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+						//基础库插入数据
+						service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 						break
 					}
 
 							return
 						} else {
 							err = ConsumablesDeliveryTotalSix(adminInfo.Org.Id, patient_id, record_time, beforePrepares, newBeforePrepares, adminInfo.AdminUser.Id)
-							houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-							goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-							var sum_count int64
-							var sum_in_count int64
-							for _, it := range goodList {
-								sum_count += it.StockCount
-								sum_in_count += it.WarehousingCount
+							//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+							//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+							//var sum_count int64
+							//var sum_in_count int64
+							//for _, it := range goodList {
+							//	sum_count += it.StockCount
+							//	sum_in_count += it.WarehousingCount
+							//}
+							//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+							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.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+							//基础库插入数据
+							service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 							break
 						}
 					}
 
 					service.CreateDialysisBeforePrepareOne(&prepare)
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-					goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, it.GoodId, adminInfo.Org.Id)
-					var sum_count int64
-					var sum_in_count int64
-					for _, it := range goodList {
-						sum_count += it.StockCount
-						sum_in_count += it.WarehousingCount
+					//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, it.GoodId, adminInfo.Org.Id)
+					//var sum_count int64
+					//var sum_in_count int64
+					//for _, it := range goodList {
+					//	sum_count += it.StockCount
+					//	sum_in_count += it.WarehousingCount
+					//}
+					//service.UpdateGoodByGoodId(it.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+					stockList, _ := service.GetStockCountByGoodId(it.GoodId, storeHouseConfig.StorehouseOutInfo, adminInfo.Org.Id)
+					var total_count int64
+					for _, it := range stockList {
+						total_count += it.StockCount
 					}
-					service.UpdateGoodByGoodId(it.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+					//基础库插入数据
+					service.UpdateGoodInfoReduceSumCount(it.GoodId, total_count, adminInfo.Org.Id)
 
 					if err != nil {
 						goodObj, _ := service.GetGoodInformationByGoodId(it.GoodId)
 		service.CreateDialysisBeforePrepareOne(&prepare)
 
 		//查询默认仓库
-		houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
-		goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
-		var sum_count int64
-		var sum_in_count int64
-		for _, it := range goodList {
-			sum_count += it.StockCount
-			sum_in_count += it.WarehousingCount
+		//houseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
+		//goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.GoodId, adminInfo.Org.Id)
+		//var sum_count int64
+		//var sum_in_count int64
+		//for _, it := range goodList {
+		//	sum_count += it.StockCount
+		//	sum_in_count += it.WarehousingCount
+		//}
+		//service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+
+		//查询默认仓库
+		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.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, adminInfo.Org.Id)
+		//基础库插入数据
+		service.UpdateGoodInfoReduceSumCount(item.GoodId, total_count, adminInfo.Org.Id)
 
 	}
 
 		PatientId:               good_yc.PatientId,
 		ConsumableType:          2,
 		StorehouseId:            houseConfig.StorehouseOutInfo,
+		IsCheck:                 1,
 	}
 	warehouseOutInfo.Count = count
 
 				Type:                    1,
 				IsSys:                   1,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			err := service.AddSigleWarehouseOut(&warehouseOut)
 			if err != nil {
 			GoodTypeId:              good_yc.GoodTypeId,
 			GoodId:                  good_yc.GoodId,
 			StorehouseId:            warehouseOut.StorehouseId,
+			IsCheck:                 1,
 		}
 		warehouseOutInfo.Count = delete_count
 		stockInInfo, _ := service.FindLastStockInInfoRecord(good_yc.GoodId, orgID)

controllers/mobile_api_controllers/patient_api_controller.go

 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.Org.Id)
 
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.Org.Id)
 		if drugStockConfig.IsOpen == 1 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 									if prescriptionConfig.IsOpen == 1 {
 										if medical.IsUse == 2 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-											//查询默认仓库
-											houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-											//查询默认仓库剩余多少库存
-											list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+
+											//更新字典里面的库存
+											stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 											var sum_count int64
-											var sum_in_count int64
-											for _, it := range list {
-												baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-												if it.MaxUnit == baseDrug.MaxUnit {
-													it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-													it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-												}
-												sum_count += it.StockMaxNumber + it.StockMinNumber
-												sum_in_count += it.WarehousingCount
+											for _, its := range stockInfo {
+												sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 											}
-											service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+											service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 										}
 									}
 								} else {
 									if medical.IsUse == 2 {
 										service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-										//查询默认仓库
-										houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-										//查询默认仓库剩余多少库存
-										list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+
+										stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 										var sum_count int64
-										var sum_in_count int64
-										for _, it := range list {
-											baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-											if it.MaxUnit == baseDrug.MaxUnit {
-												it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-												it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-											}
-											sum_count += it.StockMaxNumber + it.StockMinNumber
-											sum_in_count += it.WarehousingCount
+										for _, its := range stockInfo {
+											sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 										}
-										service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+										service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 									}
 								}
 							}
 							if prescribing_number_total <= total {
 								if medical.IsUse == 2 {
 									service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
-									//查询默认仓库
-									houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-									//查询默认仓库剩余多少库存
-									list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+
+									//更新字典里面的库存
+									stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 									var sum_count int64
-									var sum_in_count int64
-									for _, it := range list {
-										baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-										if it.MaxUnit == baseDrug.MaxUnit {
-											it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-											it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-										}
-										sum_count += it.StockMaxNumber + it.StockMinNumber
-										sum_in_count += it.WarehousingCount
+									for _, its := range stockInfo {
+										sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 									}
-									service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+									service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 									c.ServeSuccessJSON(map[string]interface{}{
 										"msg":    "1",
 										"advice": advice,
 
 			//药品管理信息
 			_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminInfo.Org.Id)
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminInfo.Org.Id)
 			if drugStockConfig.IsOpen == 1 {
 				for _, item := range advices {
 					//查询改药品信息
 							config, _ := service.GetDrugOpenConfig(adminInfo.Org.Id)
 							if config.IsOpen != 1 {
 								service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-								//查询默认仓库
-								houseConfig, _ := service.GetAllStoreHouseConfig(medical.OrgId)
-								//查询默认仓库剩余多少库存
-								list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, medical.OrgId, medical.ID)
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 								var sum_count int64
-								var sum_in_count int64
-								for _, it := range list {
-									baseDrug, _ := service.GetBaseDrugMedical(medical.ID)
-									if it.MaxUnit == baseDrug.MaxUnit {
-										it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-										it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-									}
-									sum_count += it.StockMaxNumber + it.StockMinNumber
-									sum_in_count += it.WarehousingCount
+								for _, its := range stockInfo {
+									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 								}
-								service.UpdateMedicalSumCount(medical.ID, sum_count, sum_in_count, medical.OrgId)
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 							}
 
 						}

controllers/patient_api_controller.go

 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
 
+		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 		if drugStockConfig.IsOpen == 1 {
 			var total int64
 			var prescribing_number_total int64
 					//查询是否门诊处方和临时医嘱同步到透析医嘱的开关是否开启
 
 					adviceSetting, _ := service.FindAdviceSettingById(item.UserOrgId)
+
 					if adviceSetting.IsAdviceOpen == 1 {
 
 						//查询是否出库按钮开启
 									sum_in_count += it.WarehousingCount
 								}
 								service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+								//更新字典里面的库存
+								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+								for _, its := range stockInfo {
+									sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+								}
+								service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 								break
 								c.ServeSuccessJSON(map[string]interface{}{
 									"msg":    "1",
 					} else {
 						if medical.IsUse == 2 {
 							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
-							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
-							//查询默认仓库剩余多少库存
-							list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							////查询默认仓库
+							//houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+							////查询默认仓库剩余多少库存
+							//list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							//var sum_count int64
+							//var sum_in_count int64
+							//for _, it := range list {
+							//	baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+							//	if it.MaxUnit == baseDrug.MaxUnit {
+							//		it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+							//		it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+							//	}
+							//	sum_count += it.StockMaxNumber + it.StockMinNumber
+							//	sum_in_count += it.WarehousingCount
+							//}
+							//service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+							//更新字典里面的库存
 							var sum_count int64
-							var sum_in_count int64
-							for _, it := range list {
-								baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-								if it.MaxUnit == baseDrug.MaxUnit {
-									it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-									it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-								}
-								sum_count += it.StockMaxNumber + it.StockMinNumber
-								sum_in_count += it.WarehousingCount
+							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+							for _, its := range stockInfo {
+								sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 							}
-							service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.UserOrgId)
+							service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
 							break
 							c.ServeSuccessJSON(map[string]interface{}{
 								"msg":    "1",
 				}
 				if prescribing_number_total <= total {
 					if medical.IsUse == 2 {
-						config, _ := service.GetDrugOpenConfig(adminUserInfo.CurrentOrgId)
+						config, _ := service.GetDrugOpenConfigOne(adminUserInfo.CurrentOrgId)
 						if config.IsOpen != 1 {
 							service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
-
 							//查询默认仓库
 							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
 							//查询默认仓库剩余多少库存

controllers/print_data_api_controller.go

 	if types == 2 {
 		//list, err := service.GetWarehouseOutInfoGoodDetailPrintList(adminUserInfo.CurrentOrgId, startTime, endTime, limit, page)
 		list, _ := service.GetWarehouseOutInfoPrintList(adminUserInfo.CurrentOrgId, startTime, endTime)
+		fmt.Println("list23323232233232", list)
 		stockTotal, err := service.GetOutStockTotalCountTwo(startTime, endTime, adminUserInfo.CurrentOrgId)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/secondary_order_api_contorller.go

 						StorehouseId:            item.StorehouseOutId,
 						SecondWarehouseId:       item.WarehouseId,
 						IsSys:                   12,
+						IsCheck:                 1,
 					}
 					_, drugerrcodes := service.GetDrugWarehouseBySyS(orgId, 12, item.WarehouseId, record_date)
 
 						WarehouseInfoId:         0,
 						StorehouseId:            item.StorehouseOutId,
 						SecondWarehouseInfoId:   item.ID,
+						IsCheck:                 1,
 					}
 					drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
 
 						StorehouseId:      item.StorehouseInId,
 						IsSys:             13,
 						SecondWarehouseId: item.WarehouseId,
+						IsCheck:           1,
 					}
 
 					//查询该调拨单是否有生成入库单
 						RetailPrice:           0,
 						StorehouseId:          item.StorehouseInId,
 						SecondWarehouseInfoId: item.ID,
+						IsCheck:               1,
 					}
 					service.AutoDrugDeliverInfoTwelve(orgId, item.Count, &drugWarehouseOut, &drup, warehouseOutInfo, drugwarehouseInfo)
 
 					//查询默认仓库
-					houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-					//查询默认仓库剩余多少库存
-					list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ProjectId)
+					storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+					//更新字典里面的库存
+					stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.ProjectId)
 					var sum_count int64
-					var sum_in_count int64
-					for _, it := range list {
-						baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-						if it.MaxUnit == baseDrug.MaxUnit {
-							it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-							it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-						}
-						sum_count += it.StockMaxNumber + it.StockMinNumber
-						sum_in_count += it.WarehousingCount
+					for _, its := range stockInfo {
+						sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 					}
-					service.UpdateMedicalSumCount(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+					service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 				}
 			}
 
 						StorehouseId:            item.StorehouseOutId,
 						IsSys:                   12,
 						SecondWarehouseId:       item.WarehouseId,
+						IsCheck:                 1,
 					}
 
 					//查询今日是否存在调拨出库
 						WarehouseInfotId:        0,
 						StorehouseId:            item.StorehouseOutId,
 						SecondWarehouseInfoId:   item.ID,
+						IsCheck:                 1,
 					}
 
 					//入库操作
 						StorehouseId:      item.StorehouseInId,
 						IsSys:             12,
 						SecondWarehouseId: item.WarehouseId,
+						IsCheck:           1,
 					}
 					//查询该调拨单是否有生成入库单
 					_, errcodess := service.GetWarehouseBySecondWarehouseId(12, item.WarehouseId, orgId, record_date)
 						PackingPrice:          item.MinPrice,
 						StorehouseId:          item.StorehouseInId,
 						SecondWarehouseInfoId: item.ID,
+						IsCheck:               1,
 					}
 
 					//出库逻辑
 				}
 
 				//查询默认仓库
-				houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-				goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
-				var sum_count int64
-				var sum_in_count int64
-				for _, it := range goodList {
-					sum_count += it.StockCount
-					sum_in_count += it.WarehousingCount
+				storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+				stockList, _ := service.GetStockCountByGoodId(item.ProjectId, storeHouseConfig.StorehouseOutInfo, orgId)
+				var total_count int64
+				for _, it := range stockList {
+					total_count += it.StockCount
 				}
-				service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+				//基础库插入数据
+				service.UpdateGoodInfoSumCount(item.ProjectId, total_count, orgId)
 			}
 		}
 	}
 				}
 
 			}
-			//查询默认仓库
-			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, orgId, item.ProjectId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, it := range list {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-				if it.MaxUnit == baseDrug.MaxUnit {
-					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
 
-				}
-				sum_count += it.StockMaxNumber + it.StockMinNumber
-				sum_in_count += it.WarehousingCount
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			var sum_count int64
+			stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.ProjectId)
+			for _, its := range stockInfo {
+				sum_count += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
 			}
-			service.UpdateMedicalSumCount(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+			service.UpdateBaseDrugSumTwo(item.ProjectId, sum_count, item.UserOrgId)
 		}
 
 		//耗材
 			}
 
 			//查询默认仓库
-			houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
-			goodList, _ := service.GetGoodSumCountByStoreId(houseConfig.StorehouseOutInfo, item.ProjectId, item.UserOrgId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, it := range goodList {
-				sum_count += it.StockCount
-				sum_in_count += it.WarehousingCount
+			storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+			stockList, _ := service.GetStockCountByGoodId(item.ProjectId, storeHouseConfig.StorehouseOutInfo, orgId)
+			var total_count int64
+			for _, it := range stockList {
+				total_count += it.StockCount
 			}
-			service.UpdateGoodByGoodId(item.ProjectId, sum_count, sum_in_count, item.UserOrgId)
+			//基础库插入数据
+			service.UpdateGoodInfoSumCount(item.ProjectId, total_count, orgId)
 
 		}
 	}

controllers/supply_order_api_contorller.go

 						Type:              1,
 						SupplyWarehouseId: id,
 						StorehouseId:      houseConfig.DrugStorehouseInfo,
+						IsCheck:           1,
 					}
 					//查询今日是否存在入库单号
 					//_, errcode := service.GetSingleDrugWarehouseOrder(record_date, orgId)
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
 						StorehouseId:              houseConfig.DrugStorehouseInfo,
+						IsCheck:                   1,
 					}
 					if medical.MaxUnit == medical.MinUnit {
 						warehouseInfoDetailOne.StockMaxNumber = item.Count
 						Type:              1,
 						SupplyWarehouseId: id,
 						StorehouseId:      houseConfig.StorehouseInfo,
+						IsCheck:           1,
 					}
 					//查询是否存在入库单
 					//_, errcose := service.GetSindleWarehouse(record_date, orgId)
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
 						StorehouseId:              houseConfig.StorehouseInfo,
+						IsCheck:                   1,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 				}
 			service.UpdateGoodWarehousing(id, orgId)
 		}
 
-		// 查询入库单
-		drugInfo, _ := service.GetDrugSupplyWarehouseIdSeven(id, orgId)
-		for _, item := range drugInfo {
-
-			//查询默认仓库
-			houseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
-			//查询默认仓库剩余多少库存
-			list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, it := range list {
-				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
-				if it.MaxUnit == baseDrug.MaxUnit {
-					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
-					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
-
-				}
-				sum_count += it.StockMaxNumber + it.StockMinNumber
-				sum_in_count += it.WarehousingCount
-			}
-			service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
-		}
-
 		//删除药品入库单
 		service.UpdateDrugSupplyWarehousingInfo(id, orgId)
 
 		//删除入库流水
 		service.UpdateDrugSupplyFlow(id, orgId)
+		// 查询入库单
+		drugInfo, _ := service.GetDrugSupplyWarehouseIdSeven(id, orgId)
+		if len(drugInfo) > 0 {
+			for _, item := range drugInfo {
+				//查询默认仓库
+				houseConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+				//查询默认仓库剩余多少库存
+				list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, item.OrgId, item.DrugId)
+				var sum_count int64
+				var sum_in_count int64
+				for _, it := range list {
+					baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
+					if it.MaxUnit == baseDrug.MaxUnit {
+						it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
+						it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
 
-		//查寻入库单
-		info, _ := service.GetSupplySupplyWarehouseIdSeven(id, orgId)
-		for _, item := range info {
-			//扣减库存
-			//查询该机构默认仓库
-			storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
-			//查询剩余库存
-			goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
-			var sum_count int64
-			var sum_in_count int64
-			for _, item := range goodList {
-				sum_count += item.StockCount
-				sum_in_count += item.WarehousingCount
+					}
+					sum_count += it.StockMaxNumber + it.StockMinNumber
+					sum_in_count += it.WarehousingCount
+				}
+				service.UpdateMedicalSumCount(item.DrugId, sum_count, sum_in_count, item.OrgId)
+			}
+		} else {
+			for _, it := range goodOrder {
+				if it.IsSource == 1 {
+
+					service.UpdateMedicalSumCount(it.ProjectId, 0, 0, this.GetAdminUserInfo().CurrentOrgId)
+				}
 			}
-			service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+
 		}
 
 		//删除耗材入库单
 		//删除耗材入库流水
 		service.UpdateGoodSupplyFlow(id, orgId)
 
+		//查寻入库单
+		info, _ := service.GetSupplySupplyWarehouseIdSeven(id, orgId)
+		if len(info) > 0 {
+			for _, item := range info {
+				//扣减库存
+				//查询该机构默认仓库
+				storeConfig, _ := service.GetAllStoreHouseConfig(item.OrgId)
+				//查询剩余库存
+				goodList, _ := service.GetGoodSumCountByStoreId(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
+				var sum_count int64
+				var sum_in_count int64
+				for _, item := range goodList {
+					sum_count += item.StockCount
+					sum_in_count += item.WarehousingCount
+				}
+				service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
+			}
+		} else {
+			for _, it := range goodOrder {
+				if it.IsSource == 2 {
+					service.UpdateGoodByGoodId(it.ProjectId, 0, 0, this.GetAdminUserInfo().CurrentOrgId)
+				}
+			}
+		}
+
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"cancelList":   cancelList,
 				SupplyCancelOutId:       id,
 				SupplyWarehouseId:       warehouse_out_id,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
 			}
 			// 查询今日是否存在出库单
 			_, errcodes := service.GetDrugWarehouseOutById(orgId, record_date)
 				SysRecordTime:           record_date,
 				IsSource:                item.Type,
 				StorehouseId:            houseConfig.DrugStorehouseOut,
+				IsCheck:                 1,
 			}
 
 			drup, _ := service.FindBaseDrugLibRecord(orgId, item.ProjectId)
 				SupplyWarehouseId:       warehouse_out_id,
 				IsSys:                   0,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			//查询是否生成出库单
 			_, errcodes := service.FindStockOutByIsSys(orgId, 0, record_date)
 				SupplyWarehouseId:       warehouse_out_id,
 				IsSource:                item.Type,
 				StorehouseId:            houseConfig.StorehouseOutInfo,
+				IsCheck:                 1,
 			}
 			//出库逻辑
 			parseDateErr := service.ConsumablesDeliveryNight(orgId, record_date, info, &warehouseOut, item.SupplyCount, creater, warehouse_out_id, id)

enums/error_code.go

 	ErrorPsnNoEmpty = 310000
 
 	ErrorEmployeeNumber = 320000
+
+	ErrorCheckGoodParamSuccess = 3400000
+	ErrorCheckGoodParamWrong   = 3300000
 )
 
 var ErrCodeMsgs = map[int]string{
 
 	ErrorCodeStockExced: "请先出库,执行失败",
 
-	ErrorPsnNoEmpty:     "人员编码不能为空",
-	ErrorEmployeeNumber: "请输入正确的工号",
+	ErrorPsnNoEmpty:            "人员编码不能为空",
+	ErrorEmployeeNumber:        "请输入正确的工号",
+	ErrorCheckGoodParamSuccess: "反审核成功!",
+	ErrorCheckGoodParamWrong:   "该入库单已出库,反审核失败!",
 }
 
 type SGJError struct {

models/drug.go

 	MinNumber int64  `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	MinUnit   string `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	SumCount  int64  `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
+	IsUse     int64  `gorm:"column:is_user" json:"is_user" form:"is_user"`
 }
 
 func (BaseDrugLibSeven) TableName() string {

models/drug_stock.go

 	StorehouseId      int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseId int64  `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 	IsSys             int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	IsCheck           int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (DrugWarehouse) TableName() string {
 	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (DrugWarehouseInfo) TableName() string {
 type DrugWarehouseInfoSeven struct {
 	StockMaxNumber int64 `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
 	StockMinNumber int64 `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	StorehouseId   int64 `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck        int64 `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (DrugWarehouseInfoSeven) TableName() string {
 	SupplyWarehouseId       int64         `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	StorehouseId            int64         `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseId       int64         `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	IsCheck                 int64         `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (DrugWarehouseOut) TableName() string {
 }
 
 type DrugWarehouseOutInfo struct {
-	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number                  string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PatientId               int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	AdviceId                int64   `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyCancelOutId       int64   `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseId       int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	IsSource                int64   `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId   int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	AdminUserId             int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice               float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount              string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId              int64   `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	ID                      int64       `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64       `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64       `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64       `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string      `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64     `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64       `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string      `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64       `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string      `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64       `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64       `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64       `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string      `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64       `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64       `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64       `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64     `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string      `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64       `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsCheck                 int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 }
 
 func (DrugWarehouseOutInfo) TableName() string {
 	Dealers             *Dealer                `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 	DrugCancelStockInfo []*DrugCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"drugCancelStockInfo"`
 	StorehouseId        int64                  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck             int64                  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (DrugCancelStock) TableName() string {
 }
 
 type DrugCancelStockInfo struct {
-	ID               int64       `gorm:"column:id" json:"id" form:"id"`
-	DrugId           int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	CancelStockId    int64       `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	Count            int64       `gorm:"column:count" json:"count" form:"count"`
-	Price            float64     `gorm:"column:price" json:"price" form:"price"`
-	Total            float64     `gorm:"column:total" json:"total" form:"total"`
-	ProductDate      int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate       int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	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"`
-	OrgId            int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	OrderNumber      string      `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	Type             int64       `gorm:"column:type" json:"type" form:"type"`
-	Dealer           string      `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     string      `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	RetailPrice      float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number           string      `gorm:"column:number" json:"number" form:"number"`
-	RegisterAccount  string      `gorm:"column:register_account" json:"register_account" form:"register_account"`
-	Remark           string      `gorm:"column:remark" json:"remark" form:"remark"`
-	BatchNumber      string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit          string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	BaseDrugLib      BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
-	BatchNumberId    int64       `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
-	StorehouseId     int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	ID                int64                `gorm:"column:id" json:"id" form:"id"`
+	DrugId            int64                `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	CancelStockId     int64                `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	Count             int64                `gorm:"column:count" json:"count" form:"count"`
+	Price             float64              `gorm:"column:price" json:"price" form:"price"`
+	Total             float64              `gorm:"column:total" json:"total" form:"total"`
+	ProductDate       int64                `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64                `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	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"`
+	OrgId             int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber       string               `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type              int64                `gorm:"column:type" json:"type" form:"type"`
+	Dealer            string               `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      string               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice       float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice  float64              `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number            string               `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount   string               `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark            string               `gorm:"column:remark" json:"remark" form:"remark"`
+	BatchNumber       string               `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit           string               `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	BaseDrugLib       BaseDrugLib          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	BatchNumberId     int64                `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
+	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	DrugWarehouseInfo []*DrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId"json:"drug_warehouse_info" `
 }
 
 func (DrugCancelStockInfo) TableName() string {
 	return "xt_drug_flow"
 }
 
+type DrugWarehouseOutTwenty struct {
+	ID                        int64                        `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutOrderNumber   string                       `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	OperationTime             int64                        `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	Creater                   int64                        `gorm:"column:creater" json:"creater" form:"creater"`
+	OrgId                     int64                        `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                  int64                        `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                    string                       `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64                        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64                        `gorm:"column:status" json:"status" form:"status"`
+	WarehouseOutTime          int64                        `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	Dealer                    int64                        `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64                        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                      int64                        `gorm:"column:type" json:"type" form:"type"`
+	IsSys                     int64                        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SupplyCancelOutId         int64                        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId         int64                        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	StorehouseId              int64                        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseId         int64                        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	BaseDrugLib               BaseDrugLib                  `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	DrugWarehouseOutInfoTenty []*DrugWarehouseOutInfoTenty `gorm:"ForeignKey:WarehouseOutId;AssociationForeignKey:ID"json:"xt_drug_warehouse_out_info" `
+}
+
+func (DrugWarehouseOutTwenty) TableName() string {
+	return "xt_drug_warehouse_out"
+}
+
 type DrugWarehouseOutInfoTenty struct {
-	ID                      int64       `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutId          int64       `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
-	DrugId                  int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	WarehousingOutTarget    int64       `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
-	Count                   int64       `gorm:"column:count" json:"count" form:"count"`
-	CountUnit               string      `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
-	Price                   float64     `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice              float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	ProductDate             int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate              int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	Mtime                   int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime                   int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status                  int64       `gorm:"column:status" json:"status" form:"status"`
-	OrgId                   int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Remark                  string      `gorm:"column:remark" json:"remark" form:"remark"`
-	IsCancel                int64       `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
-	WarehouseOutOrderNumber string      `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	Type                    int64       `gorm:"column:type" json:"type" form:"type"`
-	Dealer                  int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	IsSys                   int64       `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SysRecordTime           int64       `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
-	RetailPrice             float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice        float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number                  string      `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PatientId               int64       `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	WarehouseInfoId         int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	AdviceId                int64       `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
-	SupplyCancelOutId       int64       `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseId       int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	IsSource                int64       `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	StorehouseId            int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseInfoId   int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
-	AdminUserId             int64       `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	LastPrice               float64     `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	StockCount              string      `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	PharmacyId              int64       `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
-	BaseDrugLib             BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	ID                      int64               `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64               `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64               `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64               `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64               `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string              `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
+	Price                   float64             `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64             `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64               `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64               `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64               `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64               `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64               `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64               `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string              `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64               `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string              `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64               `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64               `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64               `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64               `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64             `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64             `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number                  string              `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string              `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	WarehouseInfoId         int64               `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	AdviceId                int64               `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	SupplyCancelOutId       int64               `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseId       int64               `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	IsSource                int64               `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	StorehouseId            int64               `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId   int64               `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId             int64               `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice               float64             `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount              string              `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId              int64               `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	BaseDrugLib             BaseDrugLib         `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	DrugWarehouseInfo       XtDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"json:"drug_warehouse_info" `
 }
 
 func (DrugWarehouseOutInfoTenty) TableName() string {
 	return "xt_drug_warehouse_out_info"
 }
 
-type DrugWarehouseOutTwenty struct {
-	ID                        int64                     `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutOrderNumber   string                    `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	OperationTime             int64                     `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
-	Creater                   int64                     `gorm:"column:creater" json:"creater" form:"creater"`
-	OrgId                     int64                     `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier                  int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Remark                    string                    `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                     int64                     `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                     int64                     `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                    int64                     `gorm:"column:status" json:"status" form:"status"`
-	WarehouseOutTime          int64                     `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
-	Dealer                    int64                     `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer              int64                     `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Type                      int64                     `gorm:"column:type" json:"type" form:"type"`
-	IsSys                     int64                     `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
-	SupplyCancelOutId         int64                     `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
-	SupplyWarehouseId         int64                     `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
-	StorehouseId              int64                     `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	SecondWarehouseId         int64                     `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
-	DrugWarehouseOutInfoTenty DrugWarehouseOutInfoTenty `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutId"json:"xt_drug_warehouse_out_info" `
+type DrugWarehouseInfoTwenty struct {
+	ID                        int64       `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64       `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64       `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string      `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64       `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64       `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64       `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price                     float64     `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64     `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64       `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64       `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark                    string      `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                     int64       `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64       `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                    int64       `gorm:"column:status" json:"status" form:"status"`
+	OrgId                     int64       `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64       `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string      `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type                      int64       `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice               float64     `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice          float64     `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber               string      `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit                   string      `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string      `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64       `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64       `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	WarehousingInfoId         int64       `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	SupplyWarehouseId         int64       `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	BaseDrugLib               BaseDrugLib `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
 }
 
-func (DrugWarehouseOutTwenty) TableName() string {
-	return "xt_drug_warehouse_out"
+func (DrugWarehouseInfoTwenty) TableName() string {
+	return "xt_drug_warehouse_info"
 }

models/good_models.go

 	Number          string   `gorm:"column:number" json:"number" form:"number"`
 	RegisterAccount string   `gorm:"column:register_account" json:"register_account" form:"register_account"`
 	Remark          string   `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCheck         int64    `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (XtCancelStockInfo) TableName() string {

models/his_models.go

 func (VmHisOrder) TableName() string {
 	return "his_order"
 }
+
+type HisOrderTenty 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"`
+	HisPatientId                 int64                        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	PsnCertType                  string                       `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	SettleAccountsDate           int64                        `gorm:"column:settle_accounts_date" json:"settle_accounts_date" form:"settle_accounts_date"`
+	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"`
+	Number                       string                       `gorm:"column:number" json:"number" form:"number"`
+	PatientId                    int64                        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Infcode                      int64                        `gorm:"column:infcode" json:"infcode" form:"infcode"`
+	WarnMsg                      string                       `gorm:"column:warn_msg" json:"warn_msg" form:"warn_msg"`
+	Cainfo                       string                       `gorm:"column:cainfo" json:"cainfo" form:"cainfo"`
+	ErrMsg                       string                       `gorm:"column:err_msg" json:"err_msg" form:"err_msg"`
+	RespondTime                  string                       `gorm:"column:respond_time" json:"respond_time" form:"respond_time"`
+	InfRefmsgid                  string                       `gorm:"column:inf_refmsgid" json:"inf_refmsgid" form:"inf_refmsgid"`
+	OrderStatus                  int64                        `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	MdtrtId                      string                       `gorm:"column:mdtrt_id" json:"mdtrt_id" form:"mdtrt_id"`
+	SetlId                       string                       `gorm:"column:setl_id" json:"setl_id" form:"setl_id"`
+	PsnNo                        string                       `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnName                      string                       `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Certno                       string                       `gorm:"column:certno" json:"certno" form:"certno"`
+	Gend                         string                       `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                         string                       `gorm:"column:naty" json:"naty" form:"naty"`
+	Brdy                         time.Time                    `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Age                          float64                      `gorm:"column:age" json:"age" form:"age"`
+	Insutype                     string                       `gorm:"column:insutype" json:"insutype" form:"insutype"`
+	PsnType                      string                       `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	CvlservFlag                  string                       `gorm:"column:cvlserv_flag" json:"cvlserv_flag" form:"cvlserv_flag"`
+	SetlTime                     string                       `gorm:"column:setl_time" json:"setl_time" form:"setl_time"`
+	MdtrtCertType                string                       `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	MedType                      string                       `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	MedfeeSumamt                 float64                      `gorm:"column:medfee_sumamt" json:"medfee_sumamt" form:"medfee_sumamt"`
+	FulamtOwnpayAmt              float64                      `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtSelfPay               float64                      `gorm:"column:overlmt_self_pay" json:"overlmt_self_pay" form:"overlmt_self_pay"`
+	PreselfpayAmt                float64                      `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	InscpScpAmt                  float64                      `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	ActPayDedc                   float64                      `gorm:"column:act_pay_dedc" json:"act_pay_dedc" form:"act_pay_dedc"`
+	HifpPay                      float64                      `gorm:"column:hifp_pay" json:"hifp_pay" form:"hifp_pay"`
+	CvlservPay                   float64                      `gorm:"column:cvlserv_pay" json:"cvlserv_pay" form:"cvlserv_pay"`
+	PoolPropSelfpay              float64                      `gorm:"column:pool_prop_selfpay" json:"pool_prop_selfpay" form:"pool_prop_selfpay"`
+	HifesPay                     float64                      `gorm:"column:hifes_pay" json:"hifes_pay" form:"hifes_pay"`
+	HifmiPay                     float64                      `gorm:"column:hifmi_pay" json:"hifmi_pay" form:"hifmi_pay"`
+	HifobPay                     float64                      `gorm:"column:hifob_pay" json:"hifob_pay" form:"hifob_pay"`
+	MafPay                       float64                      `gorm:"column:maf_pay" json:"maf_pay" form:"maf_pay"`
+	OthPay                       float64                      `gorm:"column:oth_pay" json:"oth_pay" form:"oth_pay"`
+	FundPaySumamt                float64                      `gorm:"column:fund_pay_sumamt" json:"fund_pay_sumamt" form:"fund_pay_sumamt"`
+	PsnPartAmt                   float64                      `gorm:"column:psn_part_amt" json:"psn_part_amt" form:"psn_part_amt"`
+	AcctPay                      float64                      `gorm:"column:acct_pay" json:"acct_pay" form:"acct_pay"`
+	PsnCashPay                   float64                      `gorm:"column:psn_cash_pay" json:"psn_cash_pay" form:"psn_cash_pay"`
+	HospPartAmt                  float64                      `gorm:"column:hosp_part_amt" json:"hosp_part_amt" form:"hosp_part_amt"`
+	Balc                         float64                      `gorm:"column:balc" json:"balc" form:"balc"`
+	AcctMulaidPay                float64                      `gorm:"column:acct_mulaid_pay" json:"acct_mulaid_pay" form:"acct_mulaid_pay"`
+	MedinsSetlId                 string                       `gorm:"column:medins_setl_id" json:"medins_setl_id" form:"medins_setl_id"`
+	ClrOptins                    string                       `gorm:"column:clr_optins" json:"clr_optins" form:"clr_optins"`
+	ClrWay                       string                       `gorm:"column:clr_way" json:"clr_way" form:"clr_way"`
+	ClrType                      string                       `gorm:"column:clr_type" json:"clr_type" form:"clr_type"`
+	SetlDetail                   string                       `gorm:"column:setl_detail" json:"setl_detail" form:"setl_detail"`
+	PayWay                       int64                        `gorm:"column:pay_way" json:"pay_way" form:"pay_way"`
+	PayPrice                     float64                      `gorm:"column:pay_price" json:"pay_price" form:"pay_price"`
+	PayCardNo                    string                       `gorm:"column:pay_card_no" json:"pay_card_no" form:"pay_card_no"`
+	DiscountPrice                float64                      `gorm:"column:discount_price" json:"discount_price" form:"discount_price"`
+	PreferentialPrice            float64                      `gorm:"column:preferential_price" json:"preferential_price" form:"preferential_price"`
+	RealityPrice                 float64                      `gorm:"column:reality_price" json:"reality_price" form:"reality_price"`
+	FoundPrice                   float64                      `gorm:"column:found_price" json:"found_price" form:"found_price"`
+	MedicalInsurancePrice        float64                      `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
+	PrivatePrice                 float64                      `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	IsMedicineInsurance          int64                        `gorm:"column:is_medicine_insurance" json:"is_medicine_insurance" form:"is_medicine_insurance"`
+	SettleType                   int64                        `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	SettleStartTime              int64                        `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
+	SettleEndTime                int64                        `gorm:"column:settle_end_time" json:"settle_end_time" form:"settle_end_time"`
+	Creator                      int64                        `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                       int64                        `gorm:"column:modify" json:"modify" form:"modify"`
+	SzChargeInfo                 string                       `gorm:"column:sz_charge_info" json:"sz_charge_info" form:"sz_charge_info"`
+	SzProjectInfo                string                       `gorm:"column:sz_project_info" json:"sz_project_info" form:"sz_project_info"`
+	SzMedicineInsuranceInfo      string                       `gorm:"column:sz_medicine_insurance_info" json:"sz_medicine_insurance_info" form:"sz_medicine_insurance_info"`
+	AccountPrice                 string                       `gorm:"column:account_price" json:"account_price" form:"account_price"`
+	MzNumber                     string                       `gorm:"column:mz_number" json:"mz_number" form:"mz_number"`
+	OrgSetlNumber                string                       `gorm:"column:org_setl_number" json:"org_setl_number" form:"org_setl_number"`
+	YiliaoNumber                 string                       `gorm:"column:yiliao_number" json:"yiliao_number" form:"yiliao_number"`
+	RefundLog                    string                       `gorm:"column:refund_log" json:"refund_log" form:"refund_log"`
+	DetailLog                    string                       `gorm:"column:detail_log" json:"detail_log" form:"detail_log"`
+	FaPiaoCode                   string                       `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
+	FaPiaoNumber                 string                       `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`
+	RequestLog                   string                       `gorm:"column:request_log" json:"request_log" form:"request_log"`
+	RefundRequestLog             string                       `gorm:"column:refund_request_log" json:"refund_request_log" form:"refund_request_log"`
+	PType                        int64                        `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	IsPre                        int64                        `gorm:"column:is_pre" json:"is_pre" form:"is_pre"`
+	Diagnosis                    string                       `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	FaPiaoBatchnumberId          int64                        `gorm:"column:fa_piao_batchnumber_id" json:"fa_piao_batchnumber_id" form:"fa_piao_batchnumber_id"`
+	Decimal                      float64                      `gorm:"column:decimal" json:"decimal" form:"decimal"`
+	HisOrderInfoTwenty           []*HisOrderInfoTwenty        `gorm:"ForeignKey:OrderId;AssociationForeignKey:ID" json:"order_info"`
+	Patients                     Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisHospitalCheckRecordTwenty HisHospitalCheckRecordTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"hisPatient"`
+}
+
+func (HisOrderTenty) TableName() string {
+	return "his_order"
+}
+
+type HisOrderInfoTwenty struct {
+	ID                           int64                        `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber                  string                       `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	UploadDate                   int64                        `gorm:"column:upload_date" json:"upload_date" form:"upload_date"`
+	AdviceId                     int64                        `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	DetItemFeeSumamt             float64                      `gorm:"column:det_item_fee_sumamt" json:"det_item_fee_sumamt" form:"det_item_fee_sumamt"`
+	Cnt                          float64                      `gorm:"column:cnt" json:"cnt" form:"cnt"`
+	Pric                         float64                      `gorm:"column:pric" json:"pric" form:"pric"`
+	PatientId                    int64                        `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	PricUplmtAmt                 float64                      `gorm:"column:pric_uplmt_amt" json:"pric_uplmt_amt" form:"pric_uplmt_amt"`
+	SelfpayProp                  float64                      `gorm:"column:selfpay_prop" json:"selfpay_prop" form:"selfpay_prop"`
+	FulamtOwnpayAmt              float64                      `gorm:"column:fulamt_ownpay_amt" json:"fulamt_ownpay_amt" form:"fulamt_ownpay_amt"`
+	OverlmtAmt                   float64                      `gorm:"column:overlmt_amt" json:"overlmt_amt" form:"overlmt_amt"`
+	PreselfpayAmt                float64                      `gorm:"column:preselfpay_amt" json:"preselfpay_amt" form:"preselfpay_amt"`
+	BasMednFlag                  string                       `gorm:"column:bas_medn_flag" json:"bas_medn_flag" form:"bas_medn_flag"`
+	MedChrgitmType               string                       `gorm:"column:med_chrgitm_type" json:"med_chrgitm_type" form:"med_chrgitm_type"`
+	HiNegoDrugFlag               string                       `gorm:"column:hi_nego_drug_flag" json:"hi_nego_drug_flag" form:"hi_nego_drug_flag"`
+	Status                       int64                        `gorm:"column:status" json:"status" form:"status"`
+	Memo                         string                       `gorm:"column:memo" json:"memo" form:"memo"`
+	FeedetlSn                    string                       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	Mtime                        int64                        `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	InscpScpAmt                  float64                      `gorm:"column:inscp_scp_amt" json:"inscp_scp_amt" form:"inscp_scp_amt"`
+	DrtReimFlag                  string                       `gorm:"column:drt_reim_flag" json:"drt_reim_flag" form:"drt_reim_flag"`
+	Ctime                        int64                        `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	ListSpItemFlag               string                       `gorm:"column:list_sp_item_flag" json:"list_sp_item_flag" form:"list_sp_item_flag"`
+	ChldMedcFlag                 string                       `gorm:"column:chld_medc_flag" json:"chld_medc_flag" form:"chld_medc_flag"`
+	LmtUsedFlag                  string                       `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
+	ChrgitmLv                    string                       `gorm:"column:chrgitm_lv" json:"chrgitm_lv" form:"chrgitm_lv"`
+	UserOrgId                    int64                        `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	HisPatientId                 int64                        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	OrderId                      int64                        `gorm:"column:order_id" json:"order_id" form:"order_id"`
+	ProjectId                    int64                        `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Type                         int64                        `gorm:"column:type" json:"type" form:"type"`
+	ItemId                       int64                        `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	Creator                      int64                        `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                       int64                        `gorm:"column:modify" json:"modify" form:"modify"`
+	OverPricPsnPay               float64                      `gorm:"column:over_pric_psn_pay" json:"over_pric_psn_pay" form:"over_pric_psn_pay"`
+	AllowReimburse               float64                      `gorm:"column:allow_reimburse" json:"allow_reimburse" form:"allow_reimburse"`
+	SettleType                   int64                        `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
+	Patients                     Patients                     `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisHospitalCheckRecordTwenty HisHospitalCheckRecordTwenty `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"hisPatient"`
+	HisOrderTenty                HisOrderTenty                `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order"`
+	HisPrescriptionProject       HisPrescriptionProject       `gorm:"ForeignKey:ID;AssociationForeignKey:ProjectId" json:"his_prescription_project"`
+	HisDoctorAdvice              HisDoctorAdvice              `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"his_doctor_advice"`
+}
+
+func (HisOrderInfoTwenty) TableName() string {
+	return "his_order_info"
+}
+
+type HisHospitalCheckRecordTwenty struct {
+	ID                   int64  `gorm:"column:id" json:"id" form:"id"`
+	Name                 string `gorm:"column:name" json:"name" form:"name"`
+	MedicalTreatmentType int64  `gorm:"column:medical_treatment_type" json:"medical_treatment_type" form:"medical_treatment_type"`
+	RecordDate           int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IdCardNo             string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	AdminUserId          int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	Departments          int64  `gorm:"column:departments" json:"departments" form:"departments"`
+	UserOrgId            int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status               int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	PatientId            int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Number               string `gorm:"column:number" json:"number" form:"number"`
+	Doctor               int64  `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	PsnNo                string `gorm:"column:psn_no" json:"psn_no" form:"psn_no"`
+	PsnCertType          string `gorm:"column:psn_cert_type" json:"psn_cert_type" form:"psn_cert_type"`
+	Certno               string `gorm:"column:certno" json:"certno" form:"certno"`
+	PsnName              string `gorm:"column:psn_name" json:"psn_name" form:"psn_name"`
+	Gend                 string `gorm:"column:gend" json:"gend" form:"gend"`
+	Naty                 string `gorm:"column:naty" json:"naty" form:"naty"`
+	MedType              int64  `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	Brdy                 string `gorm:"column:brdy" json:"brdy" form:"brdy"`
+	Iinfo                string `gorm:"column:iinfo" json:"iinfo" form:"iinfo"`
+	Idetinfo             string `gorm:"column:idetinfo" json:"idetinfo" form:"idetinfo"`
+	IptOtpNo             string `gorm:"column:ipt_otp_no" json:"ipt_otp_no" form:"ipt_otp_no"`
+	AdmBed               int64  `gorm:"column:adm_bed" json:"adm_bed" form:"adm_bed"`
+	IdCardType           int64  `gorm:"column:id_card_type" json:"id_card_type" form:"id_card_type"`
+	Diagnosis            string `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
+	InsutypeType         string `gorm:"column:insutype_type" json:"insutype_type" form:"insutype_type"`
+	SickType             int64  `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
+	MdtrtCertType        string `gorm:"column:mdtrt_cert_type" json:"mdtrt_cert_type" form:"mdtrt_cert_type"`
+	InHosptialTime       string `gorm:"column:in_hosptial_time" json:"in_hosptial_time" form:"in_hosptial_time"`
+	OutHosptialTime      string `gorm:"column:out_hosptial_time" json:"out_hosptial_time" form:"out_hosptial_time"`
+	InHospitalStatus     int64  `gorm:"column:in_hospital_status" json:"in_hospital_status" form:"in_hospital_status"`
+	Certificates         int64  `gorm:"column:certificates" json:"certificates" form:"certificates"`
+	OutHospitalStatus    int64  `gorm:"column:out_hospital_status" json:"out_hospital_status" form:"out_hospital_status"`
+	OutWay               int64  `gorm:"column:out_way" json:"out_way" form:"out_way"`
+	Phone                string `gorm:"column:phone" json:"phone" form:"phone"`
+	BalanceAccountsType  int64  `gorm:"column:balance_accounts_type" json:"balance_accounts_type" form:"balance_accounts_type"`
+	PsnType              int64  `gorm:"column:psn_type" json:"psn_type" form:"psn_type"`
+	InsuplcAdmdvs        string `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+}
+
+func (HisHospitalCheckRecordTwenty) TableName() string {
+	return "his_hospital_check_record"
+}

models/self_drug_models.go

 	SupplyWarehouseId         int64      `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	SupplyWarehouseDetailInfo int64      `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64      `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck                   int64      `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (XtDrugWarehouseInfo) TableName() string {
 	DrugOriginPlace  string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
 	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	CountUnit        string  `json:"count_unit"`
+	IsCheck          string  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type BloodDrugCancelStockInfo struct {

models/stock_models.go

 	StorehouseId      int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsSys             int64        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	SecondWarehouseId int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	IsCheck           int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (Warehousing) TableName() string {
 	SupplyWarehouseDetailInfo int64       `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 	StorehouseId              int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64       `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	IsCheck                   int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber            string      `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (WarehousingInfo) TableName() string {
 	Count             int64       `gorm:json:"count"`
 	PackingPrice      float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 	StorehouseId      int64       `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck           int64       `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type WarehouseOut struct {
 	SupplyWarehouseId       int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseId       int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
+	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (WarehouseOut) TableName() string {
 	AdminUserId             int64        `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	BuyPrice                float64      `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StockCount              string       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RegisterNumber          string       `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (WarehouseOutInfo) TableName() string {
 	Type              int64                `gorm:"column:type" json:"type"`
 	XtCancelStockInfo []*XtCancelStockInfo `gorm:"ForeignKey:CancelStockId;AssociationForeignKey:ID" json:"XtCancelStockInfo"`
 	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (CancelStock) TableName() string {
 	AdminUserId               int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
 	BuyPrice                  float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StockCount                string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (VmStockFlow) TableName() string {
 	PatientId       int64              `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	RecordDate      int64              `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	StorehouseId    int64              `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck         int64              `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (CancelStockInfo) TableName() string {
 	PackingUnit       string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck           string  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 type XtStockAdjustPrice struct {
 func (DrugOutConfig) TableName() string {
 	return "xt_drug_out_config"
 }
+
+type VmWarehousingInfoSix struct {
+	ID                        int64    `gorm:"column:id" json:"id"`
+	WarehousingId             int64    `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId                    int64    `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId                int64    `gorm:"column:good_type_id" json:"good_type_id"`
+	Number                    string   `gorm:"column:number" json:"number"`
+	ProductDate               int64    `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate                int64    `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount          int64    `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit           string   `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price                     float64  `gorm:"column:price" json:"price"`
+	TotalPrice                float64  `gorm:"column:total_price" json:"total_price"`
+	Dealer                    int64    `gorm:"column:dealer" json:"dealer"`
+	Manufacturer              int64    `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark                    string   `gorm:"column:remark" json:"remark"`
+	Ctime                     int64    `gorm:"column:ctime" json:"ctime"`
+	Mtime                     int64    `gorm:"column:mtime" json:"mtime"`
+	Status                    int64    `gorm:"column:status" json:"status"`
+	OrgId                     int64    `gorm:"column:org_id" json:"org_id"`
+	IsReturn                  int64    `gorm:"column:is_return" json:"is_return"`
+	StockCount                int64    `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingOrder          string   `gorm:"column:warehousing_order" json:"warehousing_order"`
+	GoodInfo                  GoodInfo `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	Type                      int64    `gorm:"column:type" json:"type"`
+	LicenseNumber             string   `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId           int64    `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice              float64  `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId         int64    `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64    `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64    `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64    `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+}
+
+func (VmWarehousingInfoSix) TableName() string {
+	return "xt_warehouse_info"
+}

service/gobal_config_service.go

 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
 	dbOne := XTReadDB().Table("xt_base_drug as t").Where("t.status =1")
 	dbTwo := XTReadDB().Table("xt_drug_warehouse as s").Where("s.status = 1")
 	dbThree := UserReadDB().Table("sgj_user_admin_role as r").Where("r.status = 1")
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1")
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1 and x.is_check = 1")
 	dbOne := XTReadDB().Table("xt_base_drug as b").Where("b.status =1")
 	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
 	fmt.Print(dbOne, dbTwo)
 		if storehouse_id > 0 {
 			db = db.Where("storehouse_id = ?", storehouse_id)
 		}
-		return db.Where("status = 1")
+		return db.Where("status = 1 and is_check = 1")
 	}).Preload("DrugCancelStockInfo", func(db *gorm.DB) *gorm.DB {
 		if startime > 0 {
 			db = db.Where("ctime>=?", startime)
 
 func GetBatchOrderDetail(drugid int64, orgid int64, page int64, limit int64) (drug []*models.DrugWarehouseInfo, total int64, err error) {
 	offset := (page - 1) * limit
-	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ? and status = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ? and status = 1 and is_check = 1", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&drug).Error
 	return drug, total, err
 }
 

service/manage_center_service.go

 
 import (
 	"XT_New/models"
+	"fmt"
 	"github.com/jinzhu/gorm"
+	"strconv"
+	"strings"
 	"time"
 )
 
 }
 
 func FindBaseDrugLibRecord(org_id int64, id int64) (lib models.BaseDrugLib, err error) {
-	err = readDb.Model(&models.BaseDrugLib{}).Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
+	err = readDb.Model(&models.BaseDrugLib{}).Where("id = ? AND org_id = ?  AND status = 1", id, org_id).First(&lib).Error
 	return
 }
 
 func FindBaseDrugLibRecordSeven(org_id int64, id int64) (lib models.BaseDrugLibSeven, err error) {
-	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
+	err = readDb.Select("id,drug_name,max_unit,min_number,min_unit,sum_count,is_user").Where("org_id = ? AND id = ? AND status = 1", org_id, id).First(&lib).Error
 	return
 }
 
 	return &detail, nil
 }
 
+func GetDrugAutoWarehouseOutEight(patient_id int64, advicedate int64, drugid int64, adviceid int64) (models.DrugWarehouseOutInfo, error) {
+	detail := models.DrugWarehouseOutInfo{}
+	err = XTReadDB().Model(&detail).Where("patient_id = ? and sys_record_time =? and drug_id = ? and status = 1 and advice_id = ?", patient_id, advicedate, drugid, adviceid).Find(&detail).Error
+	return detail, err
+}
+
 func UpdateDrugWarehouse(id int64, info models.DrugWarehouseInfo) error {
 	err := writeDb.Model(&models.DrugWarehouseInfo{}).Where("id = ?", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", info.StockMinNumber)).Error
 	return err
 	err = XTReadDB().Model(&drug).Where("org_id = ? and status = 1", orgid).Find(&drug).Error
 	return drug, err
 }
+
+//自动退库分装方法
+
+func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) error {
+
+	//查询该病人该药品是否有库存记录
+	info, _ := GetDrugAutoWarehouseOutEight(advice.PatientId, advice.AdviceDate, advice.DrugId, advice.ID)
+	storeHouseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+	//如果剩余数量 + 退库数量 < 总入库数量
+	if info.ID > 0 {
+		//查询该药品出库批次总入库数量
+		druginfo, error := GetDrugInfoSix(info.WarehouseInfoId, info.OrgId)
+		fmt.Println(error)
+		//退库
+		drug, _ := FindBaseDrugLibRecord(advice.UserOrgId, advice.DrugId)
+		var out_count int64  //该批次出库库存
+		var sum_count int64  //该批次总库存
+		var over_count int64 //剩余数量
+
+		over_count = druginfo.StockMaxNumber*drug.MinNumber + druginfo.StockMinNumber
+		if info.CountUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+			out_count = info.Count * drug.MinNumber
+
+		}
+		if info.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+			out_count = info.Count
+		}
+
+		if info.CountUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+			out_count = info.Count
+		}
+
+		if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+			sum_count = druginfo.WarehousingCount * drug.MinNumber
+		}
+
+		if druginfo.MaxUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+			sum_count = druginfo.WarehousingCount
+		}
+
+		if druginfo.MaxUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+			sum_count = druginfo.WarehousingCount
+		}
+
+		fmt.Println("该批次剩余库存", over_count)
+		fmt.Println("该批次退库数量", out_count)
+		fmt.Println("该批次总入库数量", sum_count)
+		if (over_count + out_count) <= sum_count {
+
+			if advice.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
+				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+				//退库
+				warehouseInfo := models.DrugWarehouseInfo{
+					StockMinNumber: prescribingNumber,
+				}
+				UpdateDrugWarehouse(info.WarehouseInfoId, warehouseInfo)
+
+				operation_time := time.Now().Unix()
+
+				ctime := time.Now().Unix()
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+				total = total + 1
+				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+				cancelStock := models.DrugCancelStock{
+					OrderNumber:  orderNumber,
+					OperaTime:    operation_time,
+					OrgId:        advice.UserOrgId,
+					Creater:      creater,
+					Ctime:        ctime,
+					Status:       1,
+					ReturnTime:   advice.AdviceDate,
+					Dealer:       info.Dealer,
+					Manufacturer: info.Manufacturer,
+					Type:         1,
+					StorehouseId: storeHouseConfig.DrugStorehouseOut,
+					IsCheck:      1,
+				}
+				AddSigleDrugCancelStock(&cancelStock)
+
+				manufactureName, _ := GetManufactureById(info.Manufacturer)
+				dealer, _ := GetDealerById(info.Dealer)
+				cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+				cancelStockInfo := models.DrugCancelStockInfo{
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
+					DrugId:           info.DrugId,
+					Count:            info.Count,
+					Status:           1,
+					Ctime:            ctime,
+					OrgId:            advice.UserOrgId,
+					Type:             1,
+					Manufacturer:     manufactureName.ManufacturerName,
+					Dealer:           dealer.DealerName,
+					Total:            0,
+					RetailPrice:      info.RetailPrice,
+					RetailTotalPrice: info.RetailTotalPrice,
+					Price:            info.Price,
+					RegisterAccount:  "",
+					Remark:           info.Remark,
+					BatchNumber:      info.BatchNumber,
+					MaxUnit:          info.CountUnit,
+					ProductDate:      info.ProductDate,
+					ExpiryDate:       info.ExpiryDate,
+					BatchNumberId:    info.WarehouseInfoId,
+					StorehouseId:     storeHouseConfig.DrugStorehouseOut,
+					IsCheck:          1,
+				}
+
+				flow := models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  info.DrugId,
+					Number:                  "",
+					BatchNumber:             info.BatchNumber,
+					Count:                   info.Count,
+					UserOrgId:               advice.UserOrgId,
+					PatientId:               0,
+					SystemTime:              info.SysRecordTime,
+					ConsumableType:          7,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            info.Manufacturer,
+					Dealer:                  info.Dealer,
+					Creator:                 creater,
+					UpdateCreator:           0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   info.Price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              info.ExpiryDate,
+					ProductDate:             info.ProductDate,
+					MaxUnit:                 info.CountUnit,
+					MinUnit:                 "",
+					AdviceId:                info.AdviceId,
+					StorehouseId:            storeHouseConfig.DrugStorehouseOut,
+				}
+				CreatedCancelStock(cancelStockInfo)
+				CreateDrugFlowOne(flow)
+
+				//删除出库记录
+				UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+				//删除流水
+				UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+			}
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+
+				houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+
+				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+				if advice.PrescribingNumberUnit == drug.MaxUnit {
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMaxNumber: prescribingNumber,
+					}
+					UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
+
+				}
+
+				operation_time := time.Now().Unix()
+				ctime := time.Now().Unix()
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+				total = total + 1
+				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+				cancelStock := models.DrugCancelStock{
+					OrderNumber:  orderNumber,
+					OperaTime:    operation_time,
+					OrgId:        advice.UserOrgId,
+					Creater:      creater,
+					Ctime:        ctime,
+					Status:       1,
+					ReturnTime:   advice.AdviceDate,
+					Dealer:       info.Dealer,
+					Manufacturer: info.Manufacturer,
+					Type:         1,
+					StorehouseId: houseConfig.DrugStorehouseOut,
+					IsCheck:      1,
+				}
+				AddSigleDrugCancelStock(&cancelStock)
+				fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
+
+				manufactureName, _ := GetManufactureById(info.Manufacturer)
+				dealer, _ := GetDealerById(info.Dealer)
+				cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+				cancelStockInfo := models.DrugCancelStockInfo{
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
+					DrugId:           info.DrugId,
+					Count:            info.Count,
+					Status:           1,
+					Ctime:            ctime,
+					OrgId:            advice.UserOrgId,
+					Type:             1,
+					Manufacturer:     manufactureName.ManufacturerName,
+					Dealer:           dealer.DealerName,
+					Total:            0,
+					RetailPrice:      info.RetailPrice,
+					RetailTotalPrice: info.RetailTotalPrice,
+					Price:            info.Price,
+					RegisterAccount:  "",
+					Remark:           info.Remark,
+					BatchNumber:      info.BatchNumber,
+					MaxUnit:          info.CountUnit,
+					ProductDate:      info.ProductDate,
+					ExpiryDate:       info.ExpiryDate,
+					BatchNumberId:    info.WarehouseInfoId,
+					StorehouseId:     houseConfig.DrugStorehouseOut,
+					IsCheck:          1,
+				}
+
+				flow := models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  info.DrugId,
+					Number:                  "",
+					BatchNumber:             info.BatchNumber,
+					Count:                   info.Count,
+					UserOrgId:               advice.UserOrgId,
+					PatientId:               0,
+					SystemTime:              info.SysRecordTime,
+					ConsumableType:          7,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            info.Manufacturer,
+					Dealer:                  info.Dealer,
+					Creator:                 creater,
+					UpdateCreator:           0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   info.Price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              info.ExpiryDate,
+					ProductDate:             info.ProductDate,
+					MaxUnit:                 info.CountUnit,
+					MinUnit:                 "",
+					AdviceId:                info.AdviceId,
+					StorehouseId:            houseConfig.DrugStorehouseOut,
+				}
+				CreatedCancelStock(cancelStockInfo)
+				CreateDrugFlowOne(flow)
+				//删除出库记录
+				UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+				//删除流水
+				UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+			}
+
+			if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+
+				houseConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
+				floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
+
+				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
+
+				if advice.PrescribingNumberUnit == drug.MaxUnit {
+					warehouseInfo := models.DrugWarehouseInfo{
+						StockMaxNumber: prescribingNumber,
+					}
+					UpdateDrugWarehouseOne(info.WarehouseInfoId, warehouseInfo)
+
+				}
+
+				operation_time := time.Now().Unix()
+				ctime := time.Now().Unix()
+				timeStr := time.Now().Format("2006-01-02")
+				timeArr := strings.Split(timeStr, "-")
+				total, _ := FindAllDrugCancelStockTotal(advice.UserOrgId)
+				total = total + 1
+				orderNumber := "CKTKD" + strconv.FormatInt(advice.UserOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+
+				cancelStock := models.DrugCancelStock{
+					OrderNumber:  orderNumber,
+					OperaTime:    operation_time,
+					OrgId:        advice.UserOrgId,
+					Creater:      creater,
+					Ctime:        ctime,
+					Status:       1,
+					ReturnTime:   advice.AdviceDate,
+					Dealer:       info.Dealer,
+					Manufacturer: info.Manufacturer,
+					Type:         1,
+					StorehouseId: houseConfig.DrugStorehouseOut,
+					IsCheck:      1,
+				}
+				AddSigleDrugCancelStock(&cancelStock)
+				fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
+
+				manufactureName, _ := GetManufactureById(info.Manufacturer)
+				dealer, _ := GetDealerById(info.Dealer)
+				cancelInfo, _ := GetLastDrugCancelStockById(advice.UserOrgId)
+				cancelStockInfo := models.DrugCancelStockInfo{
+					OrderNumber:      cancelInfo.OrderNumber,
+					CancelStockId:    cancelInfo.ID,
+					DrugId:           info.DrugId,
+					Count:            info.Count,
+					Status:           1,
+					Ctime:            ctime,
+					OrgId:            advice.UserOrgId,
+					Type:             1,
+					Manufacturer:     manufactureName.ManufacturerName,
+					Dealer:           dealer.DealerName,
+					Total:            0,
+					RetailPrice:      info.RetailPrice,
+					RetailTotalPrice: info.RetailTotalPrice,
+					Price:            info.Price,
+					RegisterAccount:  "",
+					Remark:           info.Remark,
+					BatchNumber:      info.BatchNumber,
+					MaxUnit:          info.CountUnit,
+					ProductDate:      info.ProductDate,
+					ExpiryDate:       info.ExpiryDate,
+					BatchNumberId:    info.WarehouseInfoId,
+					StorehouseId:     houseConfig.DrugStorehouseOut,
+					IsCheck:          1,
+				}
+
+				flow := models.DrugFlow{
+					WarehousingId:           0,
+					DrugId:                  info.DrugId,
+					Number:                  "",
+					BatchNumber:             info.BatchNumber,
+					Count:                   info.Count,
+					UserOrgId:               advice.UserOrgId,
+					PatientId:               0,
+					SystemTime:              info.SysRecordTime,
+					ConsumableType:          7,
+					IsSys:                   0,
+					WarehousingOrder:        "",
+					WarehouseOutId:          0,
+					WarehouseOutOrderNumber: info.WarehouseOutOrderNumber,
+					IsEdit:                  0,
+					CancelStockId:           cancelStock.ID,
+					CancelOrderNumber:       cancelStock.OrderNumber,
+					Manufacturer:            info.Manufacturer,
+					Dealer:                  info.Dealer,
+					Creator:                 creater,
+					UpdateCreator:           0,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					Price:                   info.Price,
+					WarehousingDetailId:     0,
+					WarehouseOutDetailId:    0,
+					CancelOutDetailId:       0,
+					ExpireDate:              info.ExpiryDate,
+					ProductDate:             info.ProductDate,
+					MaxUnit:                 info.CountUnit,
+					MinUnit:                 "",
+					AdviceId:                info.AdviceId,
+					StorehouseId:            houseConfig.DrugStorehouseOut,
+				}
+				CreatedCancelStock(cancelStockInfo)
+				CreateDrugFlowOne(flow)
+				//删除出库记录
+				UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+				//删除流水
+				UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+			}
+		}
+		//更新字典里面的库存
+		stockInfo, _ := GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, advice.UserOrgId, advice.DrugId)
+		//查询改药品信息
+		medical, _ := GetBaseDrugMedical(advice.DrugId)
+		var sum_count_one int64
+		for _, its := range stockInfo {
+			sum_count_one += its.StockMaxNumber*medical.MinNumber + its.StockMinNumber
+		}
+		UpdateBaseDrugSumTwo(advice.DrugId, sum_count_one, advice.UserOrgId)
+	}
+	return err
+}

service/mobile_dialysis_service.go

 // 透析记录
 func MobileGetSchedualDialysisRecordTen(orgID int64, patientID int64, recordDate int64) (*models.DialysisOrder, error) {
 	var record models.DialysisOrder
-	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ? AND  status = 1", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
+	err := readDb.Model(&models.DialysisOrder{}).Preload("DeviceNumber", "org_id = ?", orgID).Where("user_org_id = ? AND patient_id = ? AND  dialysis_date = ?", orgID, patientID, recordDate).First(&record).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil

service/patient_service.go

 
 func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient models.SchedualPatient2, err error) {
 	err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-			Preload("DeviceZone", "status = 1 AND org_id = ?", orgID).
+		return db.Preload("DeviceNumber", "org_id = ?", orgID).
+			Preload("DeviceZone", "org_id = ?", orgID).
 			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
 	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status=1", orgID, no).First(&patient).Error
 	return

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

 		return db.Where("user_org_id = ? AND status = 1", orgID).
 			Order("operate_time asc")
 	}).
-		Preload("DeviceNumber", "org_id = ? AND status = 1", orgID).
-		Preload("DeviceZone", "org_id = ? AND status = 1", orgID).
+		Preload("DeviceNumber", "org_id = ?", orgID).
+		Preload("DeviceZone", "org_id = ?", orgID).
 		Preload("DoubleCheck", "user_org_id = ? AND status = 1", orgID).
 		Preload("Summer", "user_org_id = ? AND status = 1", orgID).
 		Preload("Advices", func(db *gorm.DB) *gorm.DB {

service/secondary_service.go

 
 func GetDrugSumCountByStorehouseId(storehouse_id int64, orgid int64, drug_id int64) (info []*models.DrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("storehouse_id = ? and org_id = ? and status = 1 and (stock_max_number >0 or stock_min_number>0) and drug_id =?", storehouse_id, orgid, drug_id).Find(&info).Error
+	err = XTReadDB().Where("storehouse_id = ? and org_id = ? and status = 1 and (stock_max_number >0 or stock_min_number>0) and drug_id =? and is_check = 1", storehouse_id, orgid, drug_id).Find(&info).Error
 	return info, err
 }
 
 
 func GetGoodSumCountByStoreId(storehouse_id int64, goodid int64, orgid int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Where("storehouse_id = ? and good_id = ? and org_id =? and status =1 and stock_count > 0", storehouse_id, goodid, orgid).Find(&info).Error
+	err = XTReadDB().Where("storehouse_id = ? and good_id = ? and org_id =? and status =1 and stock_count > 0 and is_check = 1", storehouse_id, goodid, orgid).Find(&info).Error
 	return info, err
 }
 

service/self_drug_service.go

 }
 
 func PostSearchDrugWarehouseList(keyword string, orgid int64, storehouse_id int64) (info []*models.BloodDrugWarehouseInfo, err error) {
-	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
 	table := XTReadDB().Table("xt_base_drug as t").Where("t.status")
 	fmt.Println(table)
 	likeKey := "%" + keyword + "%"

service/stock_service.go

 	if len(warehousingInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehousingInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number,supply_warehouse_id,supply_warehouse_detail_info,storehouse_id) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price,stock_max_number,max_unit,min_unit,batch_number,stock_min_number,supply_warehouse_id,supply_warehouse_detail_info,storehouse_id,is_check) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Number)
 				insertData = append(insertData, info.SupplyWarehouseId)
 				insertData = append(insertData, info.SupplyWarehouseDetailInfo)
 				insertData = append(insertData, info.StorehouseId)
+				insertData = append(insertData, info.IsCheck)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
 	return err
 }
 
-func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64) (models.DrugAutomaticReduceDetail, error) {
-
+func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64, warhouse_out_id int64) (models.DrugAutomaticReduceDetail, error) {
 	detail := models.DrugAutomaticReduceDetail{}
-	err := XTWriteDB().Model(&detail).Where("patient_id = ? and record_time = ? and drug_id = ? and status= 1 and advice_id =?", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
-	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =?", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&detail).Where("patient_id = ? and record_time = ? and drug_id = ? and status= 1 and advice_id =? ", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =? and id = ?", patientid, recorddate, drugid, advice_id, id).Updates(map[string]interface{}{"status": 0}).Error
 	return detail, err
 }
 
-func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id int64, advice_id int64) (models.DrugFlow, error) {
+func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id int64, advice_id int64, id int64) (models.DrugFlow, error) {
 	flow := models.DrugFlow{}
 	err := XTWriteDB().Model(&flow).Where("patient_id =? and warehouse_out_order_number = ? and drug_id = ? and status = 1 and advice_id =?", patientid, warehouse_out_number, drug_id, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	return flow, err
 	info := models.WarehousingInfo{}
 	var err error
 	if storehouse_id == 0 {
-		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1", goodId).Find(&info).Error
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and is_check = 1", goodId).Find(&info).Error
 	}
 	if storehouse_id > 0 {
-		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and storehouse_id = ?", goodId, storehouse_id).Find(&info).Error
+		err = XTReadDB().Select(" good_id,sum(stock_count) as stock_count").Where("good_id = ? and status = 1 and storehouse_id = ? and is_check = 1", goodId, storehouse_id).Find(&info).Error
 	}
 
 	return info, err
 //药品先进先出,找出最先入库的批次
 
 func FindLastDrugWarehousingInfoByID(drug_id int64, storehouse_id int64) (info models.XtDrugWarehouseInfo, err error) {
-	err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and storehouse_id = ?", drug_id, storehouse_id).Order("ctime").First(&info).Error
+	err = readDb.Model(&models.XtDrugWarehouseInfo{}).Where("drug_id = ? AND status = 1 AND (stock_max_number > 0 or stock_min_number > 0) and storehouse_id = ? and is_check = 1", drug_id, storehouse_id).Order("ctime").First(&info).Error
 	return info, err
 }
 
 
 }
 
-func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64) (list []*models.Warehousing, total int64, err error) {
+func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, check_type int64) (list []*models.Warehousing, total int64, err error) {
 	db := readDb.Model(&models.Warehousing{})
 	db = db.Where("xt_warehouse.org_id = ? AND xt_warehouse.status = 1 AND xt_warehouse.type = ?", orgId, types)
 
 		db = db.Where("xt_warehouse.storehouse_id = ?", storehouse_id)
 	}
 
+	if check_type == 0 {
+		db = db.Where("xt_warehouse.is_check = 0 or xt_warehouse.is_check = 1 or xt_warehouse.is_check = 2")
+	}
+	if check_type > 0 {
+		db = db.Where("xt_warehouse.is_check = ?", check_type)
+	}
+
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_warehouse.ctime desc").Find(&list).Error
 	SupplyWarehouseId int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsSys             int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
 }
 
 func (VMDrugWarehouse) TableName() string {
 	return
 }
 
-func FindAllDrugWarehousingListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64) (list []*VMDrugWarehouse, total int64, err error) {
+func FindAllDrugWarehousingListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, check_type int64) (list []*VMDrugWarehouse, total int64, err error) {
 	db := readDb.Model(&VMDrugWarehouse{})
 	db = db.Where("xt_drug_warehouse.org_id = ? AND xt_drug_warehouse.status = 1", orgId)
 	db = db.Preload("Manufacturers", "status = 1 AND org_id = ?", orgId)
 	if storehouse_id > 0 {
 		db = db.Where("xt_drug_warehouse.storehouse_id = ?", storehouse_id)
 	}
+	if check_type > 0 {
+		db = db.Where("xt_drug_warehouse.is_check = ?", check_type)
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse.ctime desc").Find(&list).Error
 }
 
 type DrugCancelStockInfo struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	CancelStockId    int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
-	Count            int64   `gorm:"column:count" json:"count" form:"count"`
-	Price            float64 `gorm:"column:price" json:"price" form:"price"`
-	Total            float64 `gorm:"column:total" json:"total" form:"total"`
-	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	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"`
-	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	Dealer           string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	Number           string  `gorm:"column:number" json:"number" form:"number"`
-	RegisterAccount  string  `gorm:"column:register_account" json:"register_account" form:"register_account"`
-	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
-	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
-	BatchNumberId    int64   `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
-	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	ID                int64                         `gorm:"column:id" json:"id" form:"id"`
+	DrugId            int64                         `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	CancelStockId     int64                         `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	Count             int64                         `gorm:"column:count" json:"count" form:"count"`
+	Price             float64                       `gorm:"column:price" json:"price" form:"price"`
+	Total             float64                       `gorm:"column:total" json:"total" form:"total"`
+	ProductDate       int64                         `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate        int64                         `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	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"`
+	OrgId             int64                         `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber       string                        `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type              int64                         `gorm:"column:type" json:"type" form:"type"`
+	Dealer            string                        `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      string                        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice       float64                       `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice  float64                       `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number            string                        `gorm:"column:number" json:"number" form:"number"`
+	RegisterAccount   string                        `gorm:"column:register_account" json:"register_account" form:"register_account"`
+	Remark            string                        `gorm:"column:remark" json:"remark" form:"remark"`
+	BatchNumber       string                        `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit           string                        `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	Drug              *Drug                         `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	BatchNumberId     int64                         `gorm:"column:batch_number_id" json:"batch_number_id" form:"batch_number_id"`
+	StorehouseId      int64                         `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	DrugWarehouseInfo []*models.XtDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:DrugId" json:"drug_warehouse_info"`
 }
 
 func (DrugCancelStockInfo) TableName() string {
 }
 
 func FindDrugCancelStockInfoById(id int64, org_id int64) (list []*DrugCancelStockInfo, err error) {
-	err = readDb.Model(&DrugCancelStockInfo{}).Preload("Drug", "status = 1 AND org_id = ? ", org_id).Where("cancel_stock_id = ? AND status = 1", id).Find(&list).Error
+	err = readDb.Model(&DrugCancelStockInfo{}).Preload("Drug", "status = 1 AND org_id = ? ", org_id).Preload("DrugWarehouseInfo", "status = 1 AND org_id = ? ", org_id).Where("cancel_stock_id = ? AND status = 1", id).Find(&list).Error
 	return list, err
 }
 
 
 }
 
-func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64) (list []*models.WarehouseOut, total int64, err error) {
+func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64, check_type int64) (list []*models.WarehouseOut, total int64, err error) {
 	db := readDb.Model(&models.WarehouseOut{})
 	db = db.Where("xt_warehouse_out.org_id = ? AND xt_warehouse_out.status = 1 AND xt_warehouse_out.type = ?", orgId, types)
 
 		db = db.Where("xt_warehouse_out.storehouse_id = ?", storehouse_id)
 	}
 	if way_type == 0 {
-		db = db.Where("xt_warehouse_out.is_sys = 0 || xt_warehouse_out.is_sys = 1 || xt_warehouse_out.is_sys = 12")
+		db = db.Where("xt_warehouse_out.is_sys = 0 or xt_warehouse_out.is_sys = 1 or xt_warehouse_out.is_sys = 12")
 	}
 	if way_type == 1 {
 		db = db.Where("xt_warehouse_out.is_sys = 0")
 	if way_type == 3 {
 		db = db.Where("xt_warehouse_out.is_sys = 12")
 	}
+	if check_type > 0 {
+		db = db.Where("xt_warehouse_out.is_check = ?", check_type)
+	}
+	if check_type == 0 {
+		db = db.Where("xt_warehouse_out.is_check = 1 or xt_warehouse_out.is_check = 2")
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	if orgId == 10191 {
 
 }
 
-func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64) (list []*models.DrugWarehouseOut, total int64, err error) {
+func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64, storehouse_id int64, way_type int64, check_type int64) (list []*models.DrugWarehouseOut, total int64, err error) {
 	db := readDb.Model(&models.DrugWarehouseOut{})
 	db = db.Where("xt_drug_warehouse_out.org_id = ? AND xt_drug_warehouse_out.status = 1 ", orgId)
 
 	if storehouse_id > 0 {
 		db = db.Where("xt_drug_warehouse_out.storehouse_id = ?", storehouse_id)
 	}
+	if check_type > 0 {
+		db = db.Where("xt_drug_warehouse_out.is_check = ?", check_type)
+	}
 
 	if way_type == 0 {
 		db = db.Where("xt_drug_warehouse_out.is_sys = 0 || xt_drug_warehouse_out.is_sys = 1 || xt_drug_warehouse_out.is_sys = 12")
 	return err
 }
 
-func FindAllCancelList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, storehouse_id int64) (list []*models.CancelStock, total int64, err error) {
+func FindAllCancelList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, storehouse_id int64, check_type int64) (list []*models.CancelStock, total int64, err error) {
 	db := readDb.Model(&models.CancelStock{})
 	db = db.Where("xt_cancel_stock.org_id = ? AND xt_cancel_stock.status = 1 AND xt_cancel_stock.type = ?", orgId, types)
 	if len(keywords) > 0 {
 	if storehouse_id > 0 {
 		db = db.Where("xt_cancel_stock.storehouse_id = ?", storehouse_id)
 	}
+	if check_type > 0 {
+		db = db.Where("xt_cancel_stock.is_check = ?", check_type)
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_cancel_stock.ctime desc").Find(&list).Error
 	return
 }
 
-func FindAllDrugCancelList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, storehoue_id int64) (list []*models.DrugCancelStock, total int64, err error) {
+func FindAllDrugCancelList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, storehoue_id int64, check_type int64) (list []*models.DrugCancelStock, total int64, err error) {
 	db := readDb.Model(&models.DrugCancelStock{})
 	db = db.Where("xt_drug_cancel_stock.org_id = ? AND xt_drug_cancel_stock.status = 1", orgId)
 	if len(keywords) > 0 {
 	if storehoue_id > 0 {
 		db = db.Where("xt_drug_cancel_stock.storehouse_id = ?", storehoue_id)
 	}
+	if check_type > 0 {
+		db = db.Where("xt_drug_cancel_stock.is_check = ?", check_type)
+	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_drug_cancel_stock.ctime desc").Find(&list).Error
 func FindStockInDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (list []*models.WarehousingInfo, total int64, err error) {
 
 	db := readDb.Model(&models.WarehousingInfo{})
-	db = db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1", orgId)
+	db = db.Where("xt_warehouse_info.org_id = ? AND xt_warehouse_info.status = 1 AND xt_warehouse_info.is_check = 1", orgId)
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
 		//db = db.Joins("join xt_warehouse on xt_warehouse.id = xt_warehouse_info.warehousing_id AND ")
 
 func FindStockOutDetailList(orgId int64, page int64, limit int64, startTime int64, endTime int64, keywords string, manufacturer int64, order_type int64, dealer int64, storehouse_id int64) (list []*models.WarehouseOutInfo, total int64, err error) {
 	db := readDb.Model(&models.WarehouseOutInfo{})
-	db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.good_id <> 0 AND xt_warehouse_out_info.count <> 0 ", orgId)
+	db = db.Where("xt_warehouse_out_info.org_id = ? AND xt_warehouse_out_info.status = 1 AND xt_warehouse_out_info.is_check = 1 AND xt_warehouse_out_info.good_id <> 0 AND xt_warehouse_out_info.count <> 0 ", orgId)
 
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
 		if storehouse_id > 0 {
 			db = db.Where("storehouse_id = ?", storehouse_id)
 		}
-		return db.Where("status = 1")
+		return db.Where("status = 1 and is_check = 1")
 	}).Preload("WarehousingInfo", func(db *gorm.DB) *gorm.DB {
 		if startime > 0 {
 			db = db.Where("ctime>=?", startime)
 func GetStockListById(good_id int64, orgid int64, limit int64, page int64, startime int64, endtime int64) (info []*models.VmWarehousingInfo, total int64, err error) {
 
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status= 1")
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status= 1 and x.is_check = 1")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
 	fmt.Println(table)
 	if startime > 0 {
 	if orgid > 0 {
 		db = db.Where("x.org_id= ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_order_number,x.operation_time,x.creater,x.org_id,x.modifier,x.remark,x.warehouse_out_time,x.dealer,x.manufacturer,x.type").Find(&out).Error
+	err = db.Select("x.id,x.warehouse_out_order_number,x.operation_time,x.creater,x.org_id,x.modifier,x.remark,x.warehouse_out_time,x.dealer,x.manufacturer,x.type").Preload("WarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+		return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("WarehousingInfo", "status = 1 and org_id = ?", orgid)
+	}).Find(&out).Error
 	return out, err
 }
 
 
 	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
-	fmt.Println(table)
+	tableOne := XTReadDB().Table("xt_warehouse_info as n").Where("n.status = 1")
+	fmt.Println(table, tableOne)
 	if len(id) > 0 {
 		db = db.Where("x.warehouse_out_id in (?)", id)
 	}
 		db = db.Where("x.org_id = ?", orgid)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,n.number,x.remark,x.license_number,x.storehouse_id,x.admin_user_id,x.buy_price,x.stock_count,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit,t.packing_price").Joins("left join xt_warehouse_info as n on n.id=x.warehouse_info_id").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
 
 func GetDrugWarehouseOutTenty(warehouse_out_id []string, orgid int64) (out []*models.DrugWarehouseOutTwenty, err error) {
 
-	err = XTReadDB().Where("id in(?)", warehouse_out_id).
-		Preload("DrugWarehouseOutInfoTenty", func(db *gorm.DB) *gorm.DB {
-			return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("BaseDrugLib", "status = 1 and org_id = ?", orgid)
-		}).Find(&out).Error
+	err = XTReadDB().Where("id in(?)", warehouse_out_id).Preload("DrugWarehouseOutInfoTenty", func(db *gorm.DB) *gorm.DB {
+		return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("BaseDrugLib", "status = 1 and org_id = ?", orgid).Preload("DrugWarehouseInfo", "status = 1 and org_id = ?", orgid)
+	}).Find(&out).Error
 
 	return out, err
 }
 	return info, err
 }
 
-func GetDrugWarehouseInfoPrescriptionSeven(drugid int64, orgid int64) (info []*models.DrugWarehouseInfoSeven, err error) {
+func GetDrugWarehouseInfoPrescriptionSeven(drugid int64, orgid int64, storehouse_id int64) (info []*models.DrugWarehouseInfoSeven, err error) {
 
-	err = XTReadDB().Select("id,stock_max_number,stock_min_number").Where("drug_id = ? and org_id =? and status = 1", drugid, orgid).Find(&info).Error
+	err = XTReadDB().Select("id,stock_max_number,stock_min_number").Where("drug_id = ? and org_id =? and status = 1 and storehouse_id = ? and is_check = 1", drugid, orgid, storehouse_id).Find(&info).Error
 	return info, err
 }
 
 	return info, err
 }
 
+func GetHisAdviceListByDrugIdTwo(patient_id int64, advice_date int64, orgid int64) (info []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and advice_date = ? and status = 1 and user_org_id = ?", patient_id, advice_date, orgid).Find(&info).Error
+	return info, err
+}
+
 func GetHisAdviceListByDrugIdEight(drugid int64, patient_id int64, advice_date int64, advice_id int64) (models.HisDoctorAdviceInfo, error) {
 
 	info := models.HisDoctorAdviceInfo{}
 	return detail, err
 }
 
+func GetLastDrugWarehouseOutByDrugIdTwenty(drugid int64, patient_id int64, advice_date int64, advice_id int64) (out []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("advice_id = ?  and drug_id = ? and patient_id = ? and sys_record_time = ? and status = 1 and is_check = 1", advice_id, drugid, patient_id, advice_date).Find(&out).Error
+	return out, err
+}
+
 func ModefyDrugByWarehouseInfo(id int64, stock_max_number int64) error {
 
 	err := XTWriteDB().Model(models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", stock_max_number)).Error
 
 func GetSearchGoodWarehouseList(keyword string, orgid int64, storehouse_id int64) (info []*models.BloodWarehouseInfo, err error) {
 
-	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1 and x.is_check = 1")
 	table := XTReadDB().Table("xt_goood_information as t").Where("t.status")
 	fmt.Println(table)
 	likeKey := "%" + keyword + "%"
 	return err
 }
 
-func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error {
+func UpdateWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64) error {
 
 	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId}).Error
 	return err
 func ModifyGoodReduceInformationSix(good_id int64, sum_count int64, orgid int64, retail_price float64) (models.GoodInfo, error) {
 
 	info := models.GoodInfo{}
-
-	err = XTWriteDB().Model(&info).Where("id = ? and org_id = ? and status = 1", good_id, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count - ?", sum_count)).Error
 	err = XTWriteDB().Model(&info).Where("id = ? and org_id = ? and status = 1", good_id, orgid).Update(map[string]interface{}{"batch_retai_price": retail_price}).Error
 	return info, err
 }
 	return &config, nil
 }
 
+func GetDrugOpenConfigOne(orgid int64) (models.DrugOutConfig, error) {
+
+	config := models.DrugOutConfig{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
+
+	return config, err
+}
+
 func CreateDrugOutConfig(config models.DrugOutConfig) error {
 
 	err := XTWriteDB().Create(&config).Error
 	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&config).Error
 	return config, err
 }
+
+func UpdatedWarehouseOut(id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	err = XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func UpdatedSigleWarehouseOutInfo(id int64, info *models.WarehouseOutInfo) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"warehouse_info_id": info.WarehouseInfotId}).Error
+
+	return err
+
+}
+
+func GetLastGoodWarehouseOutInfo(orgid int64, id int64) (info []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1 and warehouse_out_id = ?", orgid, id).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+		return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("GoodsType", "status = 1")
+	}).Find(&info).Error
+	return info, err
+}
+
+func GetLastGoodWarehouseOutInfoById(orgid int64) (models.WarehouseOutInfo, error) {
+	info := models.WarehouseOutInfo{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&info).Error
+	return info, err
+}
+
+func ModifyWarehouseOutInfo(id int64, info *models.WarehouseOutInfo) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "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, "number": info.Number, "license_number": info.LicenseNumber, "storehouse_id": info.StorehouseId, "admin_user_id": info.AdminUserId, "buy_price": info.BuyPrice, "stock_count": info.StockCount}).Error
+	return err
+}
+
+func UpdateWarehouseOutFlow(info models.VmStockFlow, id int64) error {
+
+	err := XTWriteDB().Model(&models.VmStockFlow{}).Where("warehouse_out_detail_id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "number": info.Number, "license_number": info.LicenseNumber, "count": info.Count, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "price": info.Price, "expire_date": info.ExpireDate, "product_date": info.ProductDate, "storehouse_id": info.StorehouseId, "admin_user_id": info.AdminUserId, "buy_price": info.BuyPrice, "stock_count": info.StockCount}).Error
+	return err
+}
+
+func GetLastGoodWarehouseOutTwenty(orgid int64) (models.WarehouseOut, error) {
+	out := models.WarehouseOut{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Last(&out).Error
+	return out, err
+}
+
+func UpdateaGoodWarehouseInfo(count int64, good_id int64, orgid int64, warehouse_info_id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("good_id = ?  and org_id = ? and status = 1 and id = ?", good_id, orgid, warehouse_info_id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+
+	return err
+}
+
+func ModifyGoodWarehouseOut(id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehouseOut{}).Where("id = ? and status =1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	err = XTWriteDB().Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id in(?) and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("warehouse_out_id in(?) and status = 1", id).Update(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
+func GetGoodWarehouseInfoById(waresing_id int64, orgid int64) (info []*models.VmWarehousingInfoSix, err error) {
+
+	err = XTReadDB().Where("org_id = ? and status = 1 and warehousing_id = ?", orgid, waresing_id).Preload("GoodInfo", func(db *gorm.DB) *gorm.DB {
+		return XTReadDB().Where("org_id=? and status = 1", orgid).Preload("GoodsType", "status = 1")
+	}).Find(&info).Error
+	return info, err
+}
+
+func FindLastWarehousing(order string) (info models.Warehousing, err error) {
+	err = readDb.Model(&models.Warehousing{}).Where("warehousing_order = ? AND status = 1", order).Last(&info).Error
+
+	return info, err
+
+}
+
+func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "warehousing_unit": info.WarehousingUnit, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "license_number": info.LicenseNumber, "packing_price": info.PackingPrice}).Error
+	return err
+}
+
+func UpdateCheckWarehouseInfo(id int64) error {
+
+	err := XTWriteDB().Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func GetWarehouseInfoList(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func UpdateWarehouseInfoByIdList(count int64, id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", count)).Error
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func ReturnCheckWarehouseInfo(id int64) error {
+
+	err := XTWriteDB().Model(&models.Warehousing{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("warehousing_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	return err
+}
+
+func UpdateWarehouseInfoByIdListTwo(count int64, id int64) error {
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", count)).Error
+	err = XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	return err
+}
+
+func UpdateWarehouseInfoFlow(id int64) error {
+
+	err := XTWriteDB().Model(models.VmStockFlow{}).Where("warehousing_detail_id =  ?", id).Update(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func FindLastWarehousingSix(org_id int64) (info models.Warehousing, err error) {
+	err = readDb.Model(&models.Warehousing{}).Where("org_id = ? AND status = 1", org_id).Last(&info).Error
+
+	return info, err
+
+}
+
+func FindLastWarehousingSeven(org_id int64) (info models.DrugWarehouse, err error) {
+	err = readDb.Model(&models.DrugWarehouse{}).Where("org_id = ? AND status = 1", org_id).Last(&info).Error
+
+	return info, err
+
+}
+
+func FindLastDrugWarehousingInfoTwenty(org_id int64) (info models.DrugWarehouseInfo, err error) {
+	err = readDb.Model(&models.DrugWarehouseInfo{}).Where("org_id = ? AND status = 1", org_id).Last(&info).Error
+
+	return info, err
+
+}
+
+func FindDrugWarehouseInfoListById(id int64, orgid int64) (info []*models.DrugWarehouseInfoTwenty, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and org_id = ? and status = 1", id, orgid).Preload("BaseDrugLib", "status = 1 and org_id =?", orgid).Find(&info).Error
+	return info, err
+}
+
+func CreatedWarehouseing(info *models.DrugWarehouseInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func UpdateWarehouseing(info *models.DrugWarehouseInfo) error {
+
+	err := XTWriteDB().Save(&info).Error
+	return err
+}
+
+func CheckWarehousingInfo(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func GetWarehousingInfoByList(id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func AddDrugWarehouseStockMaxNumber(count int64, id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func UpdateWarehousingInfoFlow(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugFlow{}).Where("warehousing_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func AddDrugWarehouseStockMinNumber(count int64, id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func ReturnCheckWarehouseingInfo(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouse{}).Where("id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("warehousing_id = ? and status = 1 and org_id = ?", id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	return err
+}
+
+func AddDrugReturnWarehouseStockMaxNumber(count int64, id int64) error {
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	return err
+}
+
+func AddDrugReturnWarehouseStockMinNumber(count int64, id int64) error {
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 2}).Error
+	return err
+}
+
+func UpdateDrugWarehouseInfoTwenty(id int64, info *models.DrugWarehouseInfo) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "warehousing_count": info.WarehousingCount, "price": info.Price, "total_price": info.TotalPrice, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "remark": info.Remark, "retail_price": info.RetailPrice, "max_unit": info.MaxUnit, "min_unit": info.MinUnit}).Error
+	return err
+}
+
+func UpdatedDrugWarehouseInfo(info *models.DrugWarehouseOutInfo, id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "count_unit": info.CountUnit, "price": info.Price, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "remark": info.Remark, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "batch_number": info.BatchNumber, "admin_user_id": info.AdminUserId, "last_price": info.LastPrice, "stock_count": info.StockCount}).Error
+	return err
+}
+
+func GetDrugLastWarehouseOut(orgid int64) (models.DrugWarehouseOut, error) {
+	out := models.DrugWarehouseOut{}
+	err := XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&out).Error
+	return out, err
+}
+
+func GetDrugWarehouseOutListById(warehouse_out_id int64, orgId int64) (info []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and org_id  =? and status = 1", warehouse_out_id, orgId).Preload("BaseDrugLib", "status=1").Find(&info).Error
+	return info, err
+}
+
+func UpdateCheckDrugOut(out models.DrugWarehouseOut, id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOut{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"is_check": out.IsCheck}).Error
+	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id = ? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func UpdateCheckDrugOutInfoList(info models.DrugWarehouseOutInfo, warehouse_out_id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id = ?  and status = 1", warehouse_out_id).Update(map[string]interface{}{"is_check": info.IsCheck}).Error
+	return err
+}
+
+func UpdateCheckDrugOutInfo(info models.DrugWarehouseOutInfo, warehouse_out_id int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id = ?", warehouse_out_id).Update(map[string]interface{}{"is_check": info.IsCheck}).Error
+	return err
+}
+
+func GetDrugWarehouseOutByLastId(id int64) (models.DrugWarehouseOut, error) {
+	out := models.DrugWarehouseOut{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&out).Error
+	return out, err
+}
+
+func UpdateDrugMaxNumber(count int64, id int64) error {
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	return err
+}
+
+func UpdateDrugMinNumber(count int64, id int64) error {
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1", id).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	return err
+}
+
+func DeleteDrugOutFlow(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(models.DrugFlow{}).Where("warehouse_out_detail_id = ? and user_org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func GetWarehouseOutByWarehouseInfoId(warehouse_info_id int64, good_id int64, orgid int64) (outInfo []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_info_id = ? and good_id = ? and org_id = ? and is_check = 1 and status = 1", warehouse_info_id, good_id, orgid).Find(&outInfo).Error
+	return outInfo, err
+}
+
+func GetDrugWarehouseOutByWarehouseInfoId(warehouse_info_id int64, drug_id int64, orgid int64) (outInfo []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_info_id = ? and drug_id = ? and org_id = ? and is_check = 1 and status = 1", warehouse_info_id, drug_id, orgid).Find(&outInfo).Error
+	return outInfo, err
+}
+
+func GetAllStockInList(id int64, orgid int64) (info []*models.VmWarehousingInfoSix, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and org_id  = ? and status = 1", id, orgid).Preload("GoodInfo", "status = 1 and org_id =?", orgid).Find(&info).Error
+	return info, err
+}
+
+func GetDrugWarehouseInfoList(id int64, orgid int64) (info []*models.DrugWarehouseInfoTwenty, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and org_id = ? and status = 1", id, orgid).Preload("BaseDrugLib", "org_id = ? and status = 1", orgid).Find(&info).Error
+
+	return info, err
+}
+
+func GetStockCountByGoodId(goodid int64, storehouse_id int64, orgId int64) (info []*models.WarehousingInfo, err error) {
+
+	err = XTReadDB().Where("good_id = ? and storehouse_id = ? and org_id = ? and status = 1 and is_check = 1", goodid, storehouse_id, orgId).Find(&info).Error
+	return info, err
+}
+
+func UpdateGoodInfoSumCount(goodid int64, sum_count int64, orgid int64) error {
+
+	err = XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", sum_count)).Error
+	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).UpdateColumn("sum_in_count", gorm.Expr("sum_in_count + ?", sum_count)).Error
+	return err
+}
+
+func UpdateGoodInfoReduceSumCount(goodid int64, sum_count int64, orgid int64) error {
+
+	err = XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", goodid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	return err
+}
+
+func GetCancelStockInfo(id int64, orgid int64) (stock []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id  = ? and org_id = ? and status  = 1", id, orgid).Preload("GoodInfo", "status = 1 and org_id = ?", orgid).Preload("WarehousingInfo", "status = 1 and org_id = ?", orgid).Find(&stock).Error
+	return stock, err
+}
+
+func ModifyCancelStockInfo(id int64, info *models.CancelStockInfo) error {
+
+	err := XTWriteDB().Model(&models.CancelStockInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"good_id": info.GoodId, "good_type_id": info.GoodTypeId, "count": info.Count, "price": info.Price, "total": info.Total, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "number": info.Number, "register_account": info.RegisterAccount, "remark": info.Remark}).Error
+	return err
+}
+
+func GetCancelStockInfoListById(cancel_stock_id int64, orgid int64) (info []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Find(&info).Error
+	return info, err
+}
+
+func GetWarehouseOutList(orgId int64, goodId int64, warehouseInfoId int64) (info []*models.WarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and good_id = ? and warehouse_info_id = ? and status = 1", orgId, goodId, warehouseInfoId).Find(&info).Error
+	return info, err
+}
+
+func GetCancelWarehouseList(orgId int64, goodId int64, warehouseInfoId int64) (info []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Where("org_id = ? and good_id = ? and warehouse_info_id = ? and status = 1", orgId, goodId, warehouseInfoId).Find(&info).Error
+	return info, err
+}
+
+func CheckCancelStock(stock models.CancelStock, cancel_stock_id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.CancelStock{}).Where("id = ? and status = 1 and org_id = ?", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	err = XTWriteDB().Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? and status = 1 and org_id = ?", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func GetCancelStockInfoById(cancel_stock_id int64, orgid int64) (info []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and org_id = ? and status = 1 and is_check = 1", cancel_stock_id, orgid).Find(&info).Error
+	return info, err
+}
+
+func UpdateCancelStockNumber(stock_count int64, warehouse_info_id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and org_id = ? and status = 1", warehouse_info_id, orgid).UpdateColumn("stock_count", gorm.Expr("stock_count + ?", stock_count)).Error
+	return err
+}
+
+func UpdateGoodSumCount(sum_count int64, good_id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and org_id = ? and status = 1", good_id, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", sum_count)).Error
+	return err
+}
+
+func UpdateStockWarehouseInfo(cancel_stock_id int64, orgid int64, stock models.CancelStock) error {
+
+	err := XTWriteDB().Model(&models.CancelStock{}).Where("id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	err = XTWriteDB().Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 2}).Error
+	return err
+}
+
+func UpdateStockWarehouseInfoStockFlow(id int64, orgid int64, goodid int64) error {
+	err = XTWriteDB().Model(&models.VmStockFlow{}).Where("cancel_out_detail_id = ? and user_org_id = ? and status = 1 and good_id =?", id, orgid, goodid).Update(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func UpdateStockNumberWarehouseInfo(warehouse_info_id int64, good_id int64, org_id int64, stock_count int64) error {
+
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("id = ? and good_id = ? and org_id = ? and status = 1", warehouse_info_id, good_id, org_id).UpdateColumn("stock_count", gorm.Expr("stock_count - ?", stock_count)).Error
+	err = XTWriteDB().Model(&models.GoodInfo{}).Where("id = ? and status = 1 and org_id = ?", good_id, org_id).UpdateColumn("sum_count", gorm.Expr("sum_count - ?", stock_count)).Error
+	return err
+}
+
+func UpdateDrugSumCount(drugid int64, sum_count int64, sum_in_count int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ?", drugid, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", sum_count)).Error
+	err = XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ?", drugid, orgid).UpdateColumn("sum_in_count", gorm.Expr("sum_in_count + ?", sum_in_count)).Error
+	return err
+}
+
+func GetDrugStockWarehouseInfo(id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func UpdateBaseDrugSum(drugid int64, orgid int64, sum_count int64, sum_in_count int64) error {
+
+	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drugid, orgid).UpdateColumn("sum_count", gorm.Expr("sum_count + ?", sum_count)).Error
+	err = XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drugid, orgid).UpdateColumn("sum_in_count", gorm.Expr("sum_in_count + ?", sum_in_count)).Error
+	return err
+}
+
+func GetDrugAllStockInfo(storehouse_id int64, orgid int64, drugid int64) (info []*models.DrugWarehouseInfo, err error) {
+
+	err = XTReadDB().Where("storehouse_id  = ? and org_id = ? and status = 1 and drug_id = ? and is_check = 1", storehouse_id, orgid, drugid).Find(&info).Error
+	return info, err
+}
+
+func UpdateBaseDrugSumInfo(sum_count int64, drugid int64, orgid int64, sum_in_count int64) error {
+
+	err := XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	err = XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and status = 1 and org_id = ?", drugid, orgid).Update(map[string]interface{}{"sum_in_count": sum_in_count}).Error
+	return err
+}
+
+func UpdateBaseDrugSumTwo(drugid int64, sum_count int64, orgid int64) error {
+
+	err = XTWriteDB().Model(&models.BaseDrugLib{}).Where("id = ? and org_id = ? and status = 1", drugid, orgid).Update(map[string]interface{}{"sum_count": sum_count}).Error
+	return err
+}
+
+func GetLastCancelStockByList(id int64, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and org_id = ? and status = 1", id, orgid).Preload("DrugWarehouseInfo", "status = 1 and org_id = ?", orgid).Preload("BaseDrugLib", "status = 1 and org_id = ?", orgid).Find(&info).Error
+	return info, err
+}
+
+func GetCancelDrugStockList(cancel_stock_id int64, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Find(&info).Error
+	return info, err
+}
+
+func ModifyCancelStock(cancel_stock_id int64, stock models.DrugCancelStock, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugCancelStock{}).Where("id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	err = XTWriteDB().Model(&models.DrugCancelStockInfo{}).Where("cancel_stock_id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	return err
+}
+
+func GetCancelDrugStock(cancel_stock_id int64, orgid int64) (models.DrugCancelStock, error) {
+	stock := models.DrugCancelStock{}
+	err := XTReadDB().Where("id = ? and org_id = ? and status = 1", cancel_stock_id, orgid).Find(&stock).Error
+	return stock, err
+}
+
+func GetDrugCancelCheckById(cancel_stock_id int64, orgid int64) (stock []*models.DrugCancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and org_id = ? and status = 1 and is_check = 1", cancel_stock_id, orgid).Find(&stock).Error
+	return stock, err
+}
+
+func GetDrugCancelCheckByIdTwenty(cancel_stock_id int64, orgid int64) (stock []*models.DrugCancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and org_id = ? and status = 1 ", cancel_stock_id, orgid).Find(&stock).Error
+	return stock, err
+}
+
+func GetDrugWarehouseOutList(batch_number_id int64, drugId int64, orgid int64) (info []*models.DrugWarehouseOutInfo, err error) {
+
+	err = XTReadDB().Where("warehouse_info_id = ? and drug_id  = ? and org_id = ? and status = 1", batch_number_id, drugId, orgid).Find(&info).Error
+	return info, err
+}
+
+func ModifyDrugWarehouseInfoStockMaxNumber(count int64, drugid int64, orgid int64, id int64) error {
+
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and drug_id = ? and status = 1", id, orgid, drugid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
+	return err
+}
+
+func ModifyDrugWarehouseInfoStockMinNumber(count int64, drugid int64, orgid int64, id int64) error {
+
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and drug_id = ? and status = 1", id, orgid, drugid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number + ?", count)).Error
+	return err
+}
+
+func ModifyDrugCancelStockInfo(id int64, info *models.DrugCancelStockInfo) error {
+
+	err := XTWriteDB().Model(&models.DrugCancelStockInfo{}).Where("id = ? and status = 1", id).Update(map[string]interface{}{"drug_id": info.DrugId, "count": info.Count, "price": info.Price, "total": info.Total, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "dealer": info.Dealer, "manufacturer": info.Manufacturer, "retail_price": info.RetailPrice, "retail_total_price": info.RetailTotalPrice, "number": info.Number, "register_account": info.RegisterAccount, "remark": info.Remark, "batch_number": info.BatchNumber, "max_unit": info.MaxUnit, "batch_number_id": info.BatchNumberId, "storehouse_id": info.StorehouseId}).Error
+	return err
+}
+
+func ReturnDrugCancelStock(cancelstock_id int64, stock models.DrugCancelStock) error {
+
+	err := XTWriteDB().Model(&models.DrugCancelStock{}).Where("id = ? and status = 1", cancelstock_id).Update(map[string]interface{}{"is_check": 2}).Error
+	err = XTWriteDB().Model(&models.DrugCancelStockInfo{}).Where("cancel_stock_id = ? and status = 1", cancelstock_id).Update(map[string]interface{}{"is_check": 2}).Error
+	return err
+}
+
+func GetDrugCancelStockInfo(cancelstock_id int64, orgid int64) (info []*models.DrugCancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and org_id = ? and status = 1", cancelstock_id, orgid).Find(&info).Error
+	return info, err
+}
+
+func ModifyDrugFlowByCancelId(cancelstock_id int64, drugId int64, orgid int64) error {
+	err := XTWriteDB().Model(&models.DrugFlow{}).Where("cancel_out_detail_id = ? and drug_id = ? and user_org_id = ? and status = 1", cancelstock_id, drugId, orgid).Update(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func ModifyDrugMaxNumberWarehouseInfo(id int64, count int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and status = 1", id, orgid).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number - ?", count)).Error
+	return err
+}
+
+func ModifyDrugMinNumberWarehouseInfo(id int64, count int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and org_id = ? and status = 1", id, orgid).UpdateColumn("stock_min_number", gorm.Expr("stock_min_number - ?", count)).Error
+	return err
+}
+
+func GetDrugInfoSix(id int64, orgid int64) (models.DrugWarehouseInfo, error) {
+
+	info := models.DrugWarehouseInfo{}
+	err := XTReadDB().Where("id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
+	return info, err
+}

service/supply_service.go

 
 func GetSupplySupplyWarehouseIdSeven(id int64, orgid int64) (info []*models.WarehousingInfo, err error) {
 
-	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
 	return info, err
 }
 
 
 func GetDrugSupplyWarehouseIdSeven(id int64, orgid int64) (info []*models.DrugWarehouseInfo, err error) {
 
-	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Find(&info).Error
+	err = XTReadDB().Where("supply_warehouse_id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
 	return info, err
 }