11月8日库存管理

controllers/dialysis_api_controller.go

@@ -3464,7 +3464,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
-			if template.TemplateId == 46 { //adminInfo.CurrentOrgId == 9538
+			if template.TemplateId == 46 || template.TemplateId == 54 { //adminInfo.CurrentOrgId == 9538
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -3493,7 +3493,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 {
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
@@ -3502,7 +3502,7 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	}
 
-	if template.TemplateId == 47 {
+	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1002,8 +1002,10 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 	catheter := c.GetString("catheter")
 	complications := c.GetString("complication")
 	remark := c.GetString("remark")
-	dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
-
+	//dialysateVolume, _ := c.GetInt64("dialysis_intakes", 0)
+	dialysis_intakes := c.GetString("dialysis_intakes")
+	dialysateVolume, _ := strconv.ParseFloat(dialysis_intakes, 64)
+	fmt.Println("dialysateVolumewode 23323233223232wode", dialysateVolume)
 	dialysis_intakes_unit, _ := c.GetInt64("dialysis_intakes_unit", 0)
 
 	blood_access_part_id, _ := c.GetInt64("blood_access_part_id", 0)
@@ -1222,6 +1224,7 @@ func (c *DialysisAPIController) PostAssessmentAfterDislysis() {
 
 		keyOne := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis_list_all"
 		redis.Set(keyOne, "", time.Second)
+		fmt.Println("err233332323232232323", err)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"assessmentAfterDislysis": assessmentAfterDislysis,
@@ -2911,7 +2914,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
-			if template.TemplateId == 46 {
+			if template.TemplateId == 46 || template.TemplateId == 54 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 60 / float64(totalMin))
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
@@ -2933,7 +2936,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 { //adminInfo.Org.Id == 9538
+	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 			record.UltrafiltrationVolume = ultrafiltration_volume
@@ -2941,7 +2944,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if template.TemplateId == 47 {
+	if template.TemplateId == 47 || template.TemplateId == 54 {
 		record.DisplacementQuantity = record.DisplacementQuantity + record.DisplacementQuantity
 	}
 

controllers/mobile_api_controllers/patient_api_controller.go

@@ -741,6 +741,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								})
 								return
 							}
+							fmt.Println("total23323232323232323232", total)
+							fmt.Println("total23323232323232323232", prescribing_number_total)
 							if prescribing_number_total <= total {
 
 								//查询是否出库按钮开启
@@ -3365,7 +3367,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
 	dialysiscount, err := service.GetDialysisCountByPatientId(firstMonthDate, xttime, patientInfo.ID, adminUserInfo.Org.Id)
-
+	lastWeight, _ := service.MobileGetLast(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	if config.IsOpen == 1 {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"users":                   adminUser,
@@ -3385,6 +3387,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"last_order":              last_order,
 			"projects":                projects,
 			"project_config":          project_config,
+			"lastWeight":              lastWeight,
 		})
 	}
 
@@ -3407,6 +3410,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 			"last_order":              last_order,
 			"projects":                projects,
 			"project_config":          project_config,
+			"lastWeight":              lastWeight,
 		})
 	}
 

controllers/patient_api_controller.go

@@ -1612,6 +1612,7 @@ func (c *PatientApiController) ExecGroupAdvice() {
 		UpdatedTime: time.Now().Unix(),
 	}
 	err = service.ExceDoctorAdviceByGroupNo(&exceAdvice, groupNo, adminUserInfo.CurrentOrgId)
+
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateDoctorAdviceFail)
 		return
@@ -1619,7 +1620,6 @@ func (c *PatientApiController) ExecGroupAdvice() {
 
 	advice.ExecutionStaff = executionStaff
 	advice.ExecutionTime = theTime.Unix()
-	// advice.Checker = checker
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":    "ok",
@@ -1665,7 +1665,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		}
 
 		executionStaff := adminUserInfo.AdminUser.Id
-		// checker := adminUserInfo.AdminUser.Id
 
 		timeLayout := "2006-01-02 15:04:05"
 		loc, _ := time.LoadLocation("Local")
@@ -1684,8 +1683,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 		exceAdvice := models.DoctorAdvice{
 			ExecutionStaff: executionStaff,
 			ExecutionTime:  theTime.Unix(),
-			// Checker:        checker,
-			UpdatedTime: time.Now().Unix(),
+			UpdatedTime:    time.Now().Unix(),
 		}
 		if advice.ParentId > 0 {
 			err = service.ExceDoctorAdviceById(&exceAdvice, advice.ParentId, patient)
@@ -1738,7 +1736,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		advice.ExecutionStaff = executionStaff
 		advice.ExecutionTime = theTime.Unix()
-		// advice.Checker = checker
 
 		//处理出库相关逻辑
 
@@ -1805,21 +1802,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 							if medical.IsUse == 2 {
 								service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 								//查询默认仓库
-								houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+								storeHouseConfig, _ := 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)
 								//更新字典里面的库存
 								stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
 								for _, its := range stockInfo {
@@ -1853,22 +1838,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					} 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)
-							//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
 							stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
@@ -2143,21 +2112,14 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						if config.IsOpen != 1 {
 							service.HisDrugsDelivery(adminUserInfo.CurrentOrgId, item.ExecutionStaff, item)
 							//查询默认仓库
-							houseConfig, _ := service.GetAllStoreHouseConfig(item.UserOrgId)
+							storeHouseConfig, _ := 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
+							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",

controllers/self_drug_api_congtroller.go

@@ -2355,7 +2355,7 @@ func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
 	storehouse_id, _ := this.GetInt64("storehouse_id")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	list, total, err := service.GetDrugInventoryDetailList(keyword, page, limit, orgId, storehouse_id)
-
+	inventoryList, _, _ := service.GetDrugInventoryDetailListTwo(keyword, page, limit, orgId, storehouse_id)
 	houseList, _ := service.GetAllStoreHouseList(orgId)
 	doctorList, _ := service.GetAllDoctorThree(orgId)
 	if err != nil {
@@ -2364,10 +2364,11 @@ func (this *SelfDrugApiController) GetDrugInventoryDetailList() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total":      total,
-		"list":       list,
-		"doctorList": doctorList,
-		"houseList":  houseList,
+		"total":         total,
+		"list":          list,
+		"doctorList":    doctorList,
+		"houseList":     houseList,
+		"inventoryList": inventoryList,
 	})
 }
 

controllers/stock_in_api_controller.go

@@ -146,6 +146,7 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/stock/returncheckwarehouseinfo", &StockManagerApiController{}, "Get:ReturnCheckWarehouseInfo")
 	beego.Router("/api/stock/checkstockwarehouseinfo", &StockManagerApiController{}, "Get:CheckStockWarehouseInfo")
 	beego.Router("/api/stock/checkreturnstockwarehouseinfo", &StockManagerApiController{}, "Get:CheckReturnStockWarehouseInfo")
+	beego.Router("/api/stock/getprintlist", &StockManagerApiController{}, "Get:GetPrintList")
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
@@ -3625,6 +3626,10 @@ func (this *StockManagerApiController) AddGoodInformation() {
 
 		special_medical := goodNameM["special_medical"].(string)
 		good.SpecialMedical = special_medical
+
+		packing_unit := goodNameM["good_unit"].(string)
+		good.PackingUnit = packing_unit
+
 		goods = append(goods, &good)
 
 	}
@@ -3662,6 +3667,9 @@ func (this *StockManagerApiController) AddGoodInformation() {
 				GoodCode:                    item.GoodCode,
 				BuyPrice:                    item.BuyPrice,
 				MedicalInsuranceNumber:      item.MedicalInsuranceNumber,
+				IsUser:                      2,
+				PackingUnit:                 item.PackingUnit,
+				PackingPrice:                item.RetailPrice,
 			}
 
 			//查询同种耗材名称同种类型同种规格的耗材是否存在
@@ -3756,7 +3764,8 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.DrugName = drug_name
 
-		dose := goodNameM["dose"].(float64)
+		doses := goodNameM["dose"].(string)
+		dose, _ := strconv.ParseFloat(doses, 64)
 		if dose < 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
@@ -3773,7 +3782,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		drug.Dose = dose
 
-		dose_unit := goodNameM["dose_unit"].(string)
+		fmt.Println("drug_233323232323232wo", drug.Dose)
 		if dose < 0 { //名字为空则生成一条导入错误日志
 			err_log := models.ExportErrLog{
 				LogType:    4,
@@ -3787,7 +3796,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			service.CreateExportErrLog(&err_log)
 			continue
 		}
-
+		dose_unit := goodNameM["dose_unit"].(string)
 		drug.DoseUnit = dose_unit
 
 		if goodNameM["min_number"] == nil || reflect.TypeOf(goodNameM["min_number"]).String() != "string" {
@@ -4198,36 +4207,10 @@ func (this *StockManagerApiController) AddDrugInformation() {
 		drug.Dealer = dealer_id
 
 		delivery_way := goodNameM["delivery_way"].(string)
-		//if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
-		//	err_log := models.ExportErrLog{
-		//		LogType:    4,
-		//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-		//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
-		//		Status:     1,
-		//		CreateTime: time.Now().Unix(),
-		//		UpdateTime: time.Now().Unix(),
-		//		ExportTime: time.Now().Unix(),
-		//	}
-		//	service.CreateExportErrLog(&err_log)
-		//	continue
-		//}
 
 		drug.DeliveryWay = delivery_way
 
 		execution_frequency := goodNameM["execution_frequency"].(string)
-		//if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
-		//	err_log := models.ExportErrLog{
-		//		LogType:    4,
-		//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-		//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
-		//		Status:     1,
-		//		CreateTime: time.Now().Unix(),
-		//		UpdateTime: time.Now().Unix(),
-		//		ExportTime: time.Now().Unix(),
-		//	}
-		//	service.CreateExportErrLog(&err_log)
-		//	continue
-		//}
 
 		drug.ExecutionFrequency = execution_frequency
 
@@ -4351,40 +4334,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 			drug.DrugName = drug_name
 
-			dose := goodNameM["dose"].(float64)
-			if dose < 0 { //名字为空则生成一条导入错误日志
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
-
-			drug.Dose = dose
-
-			dose_unit := goodNameM["dose_unit"].(string)
-			if dose < 0 { //名字为空则生成一条导入错误日志
-				err_log := models.ExportErrLog{
-					LogType:    4,
-					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-					ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的剂量单位不能为空",
-					Status:     1,
-					CreateTime: time.Now().Unix(),
-					UpdateTime: time.Now().Unix(),
-					ExportTime: time.Now().Unix(),
-				}
-				service.CreateExportErrLog(&err_log)
-				continue
-			}
-
-			drug.DoseUnit = dose_unit
-
 			if goodNameM["min_number"] == nil || reflect.TypeOf(goodNameM["min_number"]).String() != "string" {
 				utils.ErrorLog("min_number")
 				return
@@ -4619,7 +4568,6 @@ func (this *StockManagerApiController) AddDrugInformation() {
 				service.CreateExportErrLog(&err_log)
 				continue
 			}
-
 			drug.RetailPrice = retail_price
 
 			last_prices := goodNameM["last_price"].(string)
@@ -4793,36 +4741,10 @@ func (this *StockManagerApiController) AddDrugInformation() {
 			drug.Dealer = dealer_id
 
 			delivery_way := goodNameM["delivery_way"].(string)
-			//if len(delivery_way) == 0 { //名字为空则生成一条导入错误日志
-			//	err_log := models.ExportErrLog{
-			//		LogType:    4,
-			//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-			//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认给药途径不能为空",
-			//		Status:     1,
-			//		CreateTime: time.Now().Unix(),
-			//		UpdateTime: time.Now().Unix(),
-			//		ExportTime: time.Now().Unix(),
-			//	}
-			//	service.CreateExportErrLog(&err_log)
-			//	continue
-			//}
 
 			drug.DeliveryWay = delivery_way
 
 			execution_frequency := goodNameM["execution_frequency"].(string)
-			//if len(execution_frequency) == 0 { //名字为空则生成一条导入错误日志
-			//	err_log := models.ExportErrLog{
-			//		LogType:    4,
-			//		UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
-			//		ErrMsg:     "第" + strconv.Itoa(index+2) + "行" + "的默认执行频率不能为空",
-			//		Status:     1,
-			//		CreateTime: time.Now().Unix(),
-			//		UpdateTime: time.Now().Unix(),
-			//		ExportTime: time.Now().Unix(),
-			//	}
-			//	service.CreateExportErrLog(&err_log)
-			//	continue
-			//}
 
 			drug.ExecutionFrequency = execution_frequency
 
@@ -5077,7 +4999,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 
 		if len(drugList) > 0 {
 			for _, item := range drugList {
-
+				fmt.Println("retial2332332233232323223322323", item.Dose)
 				goodInfo := models.BaseDrugLib{
 					DrugName:                    item.DrugName,
 					DrugAlias:                   item.DrugAlias,
@@ -5128,6 +5050,7 @@ func (this *StockManagerApiController) AddDrugInformation() {
 					Dose:                        item.Dose,
 					MinNumber:                   item.MinNumber,
 					IsUse:                       2,
+					MinPrice:                    item.RetailPrice,
 				}
 
 				//查询同种药品同种规格是否存在
@@ -7913,3 +7836,20 @@ func (this *StockManagerApiController) CheckReturnStockWarehouseInfo() {
 		return
 	}
 }
+
+func (this *StockManagerApiController) GetPrintList() {
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	good_name := this.GetString("good_name")
+	fmt.Println(storehouse_id, good_name)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	houseList, _ := service.GetAllStoreHouseList(orgId)
+	list, total, _ := service.GetInventoryDetailList(good_name, limit, page, orgId, storehouse_id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":      list,
+		"total":     total,
+		"houseList": houseList,
+	})
+}

models/device_models.go

@@ -829,7 +829,7 @@ type XtAssessmentAfterDislysis struct {
 	Complication                    string  `gorm:"column:complication" json:"complication" form:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator" form:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark" form:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes" form:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes" form:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed" form:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion" form:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion" form:"dialysis_intakes_blood_transfusion"`

models/dialysis.go

@@ -574,7 +574,7 @@ type AssessmentAfterDislysis struct {
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`

models/drug.go

@@ -1,37 +1,36 @@
 package models
 
 type BaseDrugLib struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName               string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	DrugAlias              string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
-	DrugAliasPinyin        string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
-	DrugAliasWubi          string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
-	DrugCategory           int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
-	DrugSpec               string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
-	DrugType               int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
-	DrugStockLimit         string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
-	DrugOriginPlace        string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	DrugDosageForm         int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	MaxUnit                string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinNumber              int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit                string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Dose                   float64 `gorm:"column:dose" json:"dose" form:"dose"`
-	DoseUnit               string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
-	MinPrice               float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
-	UnitMatrixing          string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	LastPrice              float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	DrugControl            int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
-	Number                 string  `gorm:"column:number" json:"number" form:"number"`
-	DrugClassify           string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
-	DrugDose               float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
-	DrugDoseUnit           int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName                    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	DrugAlias                   string  `gorm:"column:drug_alias" json:"drug_alias" form:"drug_alias"`
+	DrugAliasPinyin             string  `gorm:"column:drug_alias_pinyin" json:"drug_alias_pinyin" form:"drug_alias_pinyin"`
+	DrugAliasWubi               string  `gorm:"column:drug_alias_wubi" json:"drug_alias_wubi" form:"drug_alias_wubi"`
+	DrugCategory                int64   `gorm:"column:drug_category" json:"drug_category" form:"drug_category"`
+	DrugSpec                    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	DrugType                    int64   `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugStockLimit              string  `gorm:"column:drug_stock_limit" json:"drug_stock_limit" form:"drug_stock_limit"`
+	DrugOriginPlace             string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	DrugDosageForm              int64   `gorm:"column:drug_dosage_form" json:"drug_dosage_form" form:"drug_dosage_form"`
+	MedicalInsuranceLevel       int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	MaxUnit                     string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                   int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                     string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                        float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                    string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MinPrice                    float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	UnitMatrixing               string  `gorm:"column:unit_matrixing" json:"unit_matrixing" form:"unit_matrixing"`
+	RetailPrice                 float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice                   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugControl                 int64   `gorm:"column:drug_control" json:"drug_control" form:"drug_control"`
+	Number                      string  `gorm:"column:number" json:"number" form:"number"`
+	DrugClassify                string  `gorm:"column:drug_classify" json:"drug_classify" form:"drug_classify"`
+	DrugDose                    float64 `gorm:"column:drug_dose" json:"drug_dose" form:"drug_dose"`
+	DrugDoseUnit                int64   `gorm:"column:drug_dose_unit" json:"drug_dose_unit" form:"drug_dose_unit"`
+	MedicalInsuranceNumber      string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
 	Manufacturer                int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	PharmacologyCategory        int64   `gorm:"column:pharmacology_category" json:"pharmacology_category" form:"pharmacology_category"`
 	StatisticsCategory          int64   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`

models/self_drug_models.go

@@ -833,46 +833,48 @@ type VmXtDrugInventory struct {
 }
 
 type XtDrugInventory struct {
-	ID                 int64   `gorm:"column:id" json:"id" form:"id"`
-	DrugName           string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	SpecificationName  string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	WarehousingUnit    string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Count              int64   `gorm:"column:count" json:"count" form:"count"`
-	LastPrice          float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
-	RetailPrice        float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	NewPrice           float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
-	Manufacturer       string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer             string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Remark             string  `gorm:"column:remark" json:"remark" form:"remark"`
-	DrugId             int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	UserOrgId          int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime              int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime              int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status             int64   `gorm:"column:status" json:"status" form:"status"`
-	WarehousingOrder   string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	LicenseNumber      string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	StartTime          int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	Creater            int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	Checker            int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckerStatus      int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
-	CheckerTime        int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
-	ExpiryDate         int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	ProductDate        int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	Number             string  `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber        string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	Total              string  `gorm:"column:total" json:"total" form:"total"`
-	DrugOriginPlace    string  `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
-	WarehouseInfoId    int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	ProofCount         int64   `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
-	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"`
-	MinCount           int64   `gorm:"column:min_count" json:"min_count" form:"min_count"`
-	MinUnit            string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	LastStockMaxNumber int64   `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
-	LastStockMinNumber int64   `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
-	InventoryType      int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
-	Type               int64   `gorm:"column:type" json:"type" form:"type"`
-	StorehouseId       int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	ID                 int64             `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string            `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName  string            `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit    string            `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count              int64             `gorm:"column:count" json:"count" form:"count"`
+	LastPrice          float64           `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice        float64           `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice           float64           `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer       string            `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer             string            `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark             string            `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId             int64             `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId          int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime              int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime              int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status             int64             `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder   string            `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber      string            `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime          int64             `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater            int64             `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker            int64             `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus      int64             `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime        int64             `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	ExpiryDate         int64             `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate        int64             `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Number             string            `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber        string            `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Total              string            `gorm:"column:total" json:"total" form:"total"`
+	DrugOriginPlace    string            `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	WarehouseInfoId    int64             `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	ProofCount         int64             `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
+	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"`
+	MinCount           int64             `gorm:"column:min_count" json:"min_count" form:"min_count"`
+	MinUnit            string            `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	LastStockMaxNumber int64             `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber int64             `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64             `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	Type               int64             `gorm:"column:type" json:"type" form:"type"`
+	StorehouseId       int64             `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	BaseDrugLib        BaseDrugLib       `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	DrugWarehouseInfo  DrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"json:"drug_warehouse_info" `
 }
 
 func (XtDrugInventory) TableName() string {

models/stock_models.go

@@ -265,7 +265,6 @@ type WarehouseOutInfo struct {
 	StockCount              string       `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	RegisterNumber          string       `gorm:"column:register_number" json:"register_number" form:"register_number"`
-
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -1060,40 +1059,42 @@ func (XtStockReportPrice) TableName() string {
 }
 
 type XtStockInventory struct {
-	ID                int64   `gorm:"column:id" json:"id" form:"id"`
-	GoodName          string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	SpecificationName string  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	WarehousingUnit   string  `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
-	Count             int64   `gorm:"column:count" json:"count" form:"count"`
-	BuyPrice          float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	PackingPrice      float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	NewPrice          float64 `gorm:"column:new_price" json:"new_price" form:"new_price"`
-	Manufacturer      string  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer            string  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Remark            string  `gorm:"column:remark" json:"remark" form:"remark"`
-	GoodId            int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	UserOrgId         int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime             int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime             int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status            int64   `gorm:"column:status" json:"status" form:"status"`
-	WarehousingOrder  string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
-	StartTime         int64   `gorm:"column:start_time" json:"start_time" form:"start_time"`
-	Creater           int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	Checker           int64   `gorm:"column:checker" json:"checker" form:"checker"`
-	CheckerStatus     int64   `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
-	CheckerTime       int64   `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
-	Total             int64   `gorm:"column:total" json:"total" form:"total"`
-	Number            string  `gorm:"column:number" json:"number" form:"number"`
-	WarehousingInfoId int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
-	ExpireDate        int64   `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
-	ProductDate       int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	GoodOriginPlace   string  `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
-	Type              int64   `gorm:"column:type" json:"type" form:"type"`
-	InventoryType     int64   `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
-	LastStockCount    int64   `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
-	StockCount        int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
-	StorehouseId      int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	ID                int64           `gorm:"column:id" json:"id" form:"id"`
+	GoodName          string          `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	SpecificationName string          `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit   string          `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count             int64           `gorm:"column:count" json:"count" form:"count"`
+	BuyPrice          float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	PackingPrice      float64         `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	NewPrice          float64         `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer      string          `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer            string          `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark            string          `gorm:"column:remark" json:"remark" form:"remark"`
+	GoodId            int64           `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	UserOrgId         int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime             int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime             int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64           `gorm:"column:status" json:"status" form:"status"`
+	WarehousingOrder  string          `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber     string          `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime         int64           `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater           int64           `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker           int64           `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus     int64           `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime       int64           `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	Total             int64           `gorm:"column:total" json:"total" form:"total"`
+	Number            string          `gorm:"column:number" json:"number" form:"number"`
+	WarehousingInfoId int64           `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
+	ExpireDate        int64           `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate       int64           `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	GoodOriginPlace   string          `gorm:"column:good_origin_place" json:"good_origin_place" form:"good_origin_place"`
+	Type              int64           `gorm:"column:type" json:"type" form:"type"`
+	InventoryType     int64           `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	LastStockCount    int64           `gorm:"column:last_stock_count" json:"last_stock_count" form:"last_stock_count"`
+	StockCount        int64           `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	StorehouseId      int64           `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	GoodInfo          GoodInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:GoodId" `
+	WarehousingInfo   WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingInfoId" json:"xt_warehouse_info"`
 }
 
 func (XtStockInventory) TableName() string {
@@ -1436,6 +1437,7 @@ type VmWarehousingInfoSix struct {
 	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"`
+	RegisterNumber            string   `gorm:"column:register_number" json:"register_number" form:"register_number"`
 }
 
 func (VmWarehousingInfoSix) TableName() string {

service/manage_center_service.go

@@ -599,9 +599,9 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			CreateDrugFlowOne(flow)
 
 			//删除出库记录
-			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
 			//删除流水
-			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
 		}
 		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
 
@@ -699,9 +699,9 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)
 			//删除出库记录
-			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
 			//删除流水
-			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
 		}
 
 		if advice.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
@@ -739,7 +739,6 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 				IsCheck:      1,
 			}
 			AddSigleDrugCancelStock(&cancelStock)
-			fmt.Println("到这里了吗32222222222222222222222222222222222222222222222")
 
 			manufactureName, _ := GetManufactureById(info.Manufacturer)
 			dealer, _ := GetDealerById(info.Dealer)
@@ -808,9 +807,9 @@ func DrugAutoAddCancelInfo(advice *models.HisDoctorAdviceInfo, creater int64) er
 			CreatedCancelStock(cancelStockInfo)
 			CreateDrugFlowOne(flow)
 			//删除出库记录
-			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID, info.WarehouseOutId)
+			UpdateDrugFlowSeven(info.PatientId, info.SysRecordTime, info.DrugId, advice.ID, info.ID)
 			//删除流水
-			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID, info.ID)
+			UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
 		}
 
 		//更新字典里面的库存

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -318,7 +318,7 @@ type AssessmentAfterDislysisVM struct {
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`
@@ -400,7 +400,7 @@ type XtAssessmentAfterDislysisVM struct {
 	Complication                    string  `gorm:"column:complication" json:"complication"`
 	Evaluator                       int64   `gorm:"column:evaluator" json:"evaluator"`
 	Remark                          string  `gorm:"column:remark" json:"remark"`
-	DialysisIntakes                 int64   `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
+	DialysisIntakes                 float64 `gorm:"column:dialysis_intakes" json:"dialysis_intakes"`
 	DialysisIntakesFeed             int64   `gorm:"column:dialysis_intakes_feed" json:"dialysis_intakes_feed"`
 	DialysisIntakesTransfusion      int64   `gorm:"column:dialysis_intakes_transfusion" json:"dialysis_intakes_transfusion"`
 	DialysisIntakesBloodTransfusion int64   `gorm:"column:dialysis_intakes_blood_transfusion" json:"dialysis_intakes_blood_transfusion"`

service/self_drug_service.go

@@ -1115,7 +1115,21 @@ func GetDrugInventoryDetailList(keyword string, page int64, limit int64, orgid i
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	err = db.Select("x.id,x.drug_name,x.specification_name,x.warehousing_unit,x.count,x.last_price,x.retail_price,x.manufacturer,x.dealer,x.remark,x.drug_id,x.warehousing_order,x.number,x.batch_number,x.start_time,x.creater,x.checker,x.checker_status,x.checker_time,x.total,x.drug_origin_place,x.expiry_date,x.product_date,x.min_count,x.storehouse_id,x.warehouse_info_id,t.dose,t.dose_unit,t.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.last_stock_max_number,x.last_stock_min_number,x.inventory_type,t.min_number,t.retail_price").Joins("left join sgj_users.sgj_user_admin_role as r on r.id = x.creater").Joins("left join xt_base_drug as t on t.id =x.drug_id").Count(&total).Offset(offset).Limit(limit).Scan(&list).Error
+	return list, total, err
+}
+
+func GetDrugInventoryDetailListTwo(keyword string, page int64, limit int64, orgid int64, storehouse_id int64) (list []*models.XtDrugInventory, total int64, err error) {
+
+	db := XTReadDB().Model(&list).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	offset := (page - 1) * limit
+	err = db.Preload("BaseDrugLib", "org_id = ? and status = 1", orgid).Preload("DrugWarehouseInfo", "org_id = ? and status = 1", orgid).Count(&total).Offset(offset).Limit(limit).Find(&list).Error
 	return list, total, err
 }
 

service/stock_service.go

@@ -739,14 +739,14 @@ func CreateDrugFlowOne(flow models.DrugFlow) error {
 	return err
 }
 
-func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64, warhouse_out_id int64) (models.DrugAutomaticReduceDetail, error) {
+func UpdateDrugFlowSeven(patientid int64, recorddate int64, drugid int64, advice_id int64, id int64) (models.DrugAutomaticReduceDetail, error) {
 	detail := models.DrugAutomaticReduceDetail{}
 	err := XTWriteDB().Model(&detail).Where("patient_id = ? and record_time = ? and drug_id = ? and status= 1 and advice_id =? ", patientid, recorddate, drugid, advice_id).Updates(map[string]interface{}{"status": 0}).Error
 	err = XTWriteDB().Model(&models.DrugWarehouseOutInfo{}).Where("patient_id =? and sys_record_time =? and drug_id = ? and status = 1 and advice_id =? and id = ?", patientid, recorddate, drugid, advice_id, id).Updates(map[string]interface{}{"status": 0}).Error
 	return detail, err
 }
 
-func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id int64, advice_id int64, id int64) (models.DrugFlow, error) {
+func UpdateDrugFlowTens(patientid int64, warehouse_out_number string, drug_id int64, advice_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
@@ -4461,7 +4461,7 @@ func GetDrugTotalCount(drugid int64, orgid int64, storehouse_id int64) (info mod
 
 func GetDrugTotalCountTwenty(drugid int64, orgid int64, storehouse_id int64) (info models.VmDrugWarehouseInfo, 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 ")
 	if drugid > 0 {
 		db = db.Where("x.drug_id = ?", drugid)
 	}
@@ -7526,3 +7526,18 @@ func GetDrugInfoSix(id int64, orgid int64) (models.DrugWarehouseInfo, error) {
 	err := XTReadDB().Where("id = ? and org_id = ? and status = 1 and is_check = 1", id, orgid).Find(&info).Error
 	return info, err
 }
+
+func GetPrintList(storehouse_id int64, good_name string, orgid int64, limit int64, page int64) (storeinventory []*models.XtStockInventory, err error) {
+
+	db := XTReadDB().Model(&storeinventory).Where("status = 1")
+
+	if storehouse_id > 0 {
+		db = db.Where("storehouse_id = ?", storehouse_id)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+
+	err = XTReadDB().Preload("GoodInfo", "status = 1 and org_id = ?", orgid).Preload("WarehousingInfo", "status = 1 and org_id=?", orgid).Find(&storeinventory).Error
+	return storeinventory, err
+}

service/warhouse_service.go

@@ -53,6 +53,7 @@ func DrugsDelivery(orgID int64, creater int64, advice *models.DoctorAdvice) (err
 				Type:                    1,
 				IsSys:                   1,
 				StorehouseId:            storeConfig.DrugStorehouseOut,
+				IsCheck:                 1,
 			}
 			err := AddSigleDrugWarehouseOut(&warehouseOut)
 			if err != nil {
@@ -166,6 +167,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			WarehouseInfoId:         warehouse.ID,
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
 		}
 
 		drugflow := models.DrugFlow{
@@ -201,17 +203,6 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		fmt.Println(errOne)
 		//查询是否存在数据
 
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//	errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//	if errOne != nil {
-		//		return errOne
-		//	}
-		//} else if errcodes == nil {
-		//  //service.GetLastDrugWarehouseOutInfoByPatientId(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//	UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
-
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -222,8 +213,8 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			RecordTime:              advice.RecordDate,
 			OrgId:                   orgID,
 			DrugId:                  advice.DrugId,
-			Count:                   count,
-			CountUnit:               advice.PrescribingNumberUnit,
+			Count:                   deliver_number,
+			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 		}
@@ -261,34 +252,30 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 		warehouse.Mtime = time.Now().Unix()
 
-		if warehouse.StockMinNumber < minNumber {
-
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-		} else {
-			if minNumber > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-			}
-
-			if minNumber == 0 && maxNumber != 1 {
-				if warehouse.StockMinNumber > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
-
-			}
-
-		}
-
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//  warehouse.StockMaxNumber = stock_max_number
-				//}
-			}
+		//if warehouse.StockMinNumber < minNumber {
+		//
+		//	warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+		//	warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		//} else {
+		//	if minNumber > 0 {
+		//		warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+		//	}
+		//
+		//	if minNumber == 0 && maxNumber != 1 {
+		//		if warehouse.StockMinNumber > 0 {
+		//			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		//		}
+		//
+		//	}
+		//
+		//}
 
-		}
+		//if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+		//	if (warehouse.StockMinNumber - deliver_number) > 0 {
+		//		warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		//	}
+		//
+		//}
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
@@ -300,14 +287,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		//if(warehouse.StockMaxNumber > 0){
-		//  var sum_count int64
-		//  sum_count = maxNumber * drup.MinNumber
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,sum_count,warehouse.OrgId,warehouse.RetailPrice)
-		//}
-		//if(warehouse.StockMinNumber > 0){
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,minNumber,warehouse.OrgId,warehouse.RetailPrice)
-		//}
+
 		if errThree != nil {
 			return errThree
 		}
@@ -339,6 +319,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			WarehouseInfoId:         warehouse.ID,
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
 		}
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
@@ -393,17 +374,11 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			MaxUnit:           warehouse.MaxUnit,
 			WarehousingInfoId: warehouse.WarehousingInfoId,
 			SupplyWarehouseId: warehouse.SupplyWarehouseId,
+			StorehouseId:      storeConfig.DrugStorehouseOut,
+			IsCheck:           1,
 		}
 		//扣减库存
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
-		//if(warehouse.StockMaxNumber > 0){
-		//  var sum_count int64
-		//  sum_count = warehouse.StockMaxNumber * drup.MinNumber
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,sum_count,warehouse.OrgId,warehouse.RetailPrice)
-		//}
-		//if(warehouse.StockMinNumber > 0){
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,warehouse.StockMinNumber,warehouse.OrgId,warehouse.RetailPrice)
-		//}
 
 		if errThree != nil {
 			return errThree
@@ -445,7 +420,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = advice.PrescribingNumberUnit
 
-		NewDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+		DrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
 	}
 
 	return
@@ -521,8 +496,6 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 // 药品出库 递归方式
 func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo) (err error) {
 
-	fmt.Println("123322332323332233223", prescribingNumber)
-	fmt.Println("233o3o22o332oo32o32o23o32o", advice.PrescribingNumberUnit)
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -674,9 +647,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 
-		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
-			minNumber = maxNumber
-		}
+		//if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
+		//	minNumber = maxNumber
+		//}
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < maxNumber && warehouse.StockMinNumber < minNumber {
@@ -697,39 +670,29 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 		warehouse.Mtime = time.Now().Unix()
 
-		if warehouse.StockMinNumber < minNumber {
-
-			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
-			warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
-		} else {
-
-			if minNumber > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
-			}
-
-			if minNumber == 0 && maxNumber != 1 {
-				if warehouse.StockMinNumber > 0 {
-					warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-				}
-
-			}
-		}
-
-		fmt.Println("maxNu目标而3232323232232323", maxNumber)
-		fmt.Println("minNumber2222222", minNumber)
-
-		fmt.Println("deliver_number23233223322332332", deliver_number)
-		fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
-			if (warehouse.StockMinNumber - deliver_number) > 0 {
-				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
-
-				//if warehouse.StockMinNumber == 0 {
-				//  warehouse.StockMaxNumber = stock_max_number
-				//}
-			}
+		//if warehouse.StockMinNumber < minNumber {
+		//
+		//	warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
+		//	warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
+		//} else {
+		//
+		//	if minNumber > 0 {
+		//		warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
+		//	}
+		//
+		//	if minNumber == 0 && maxNumber != 1 {
+		//		if warehouse.StockMinNumber > 0 {
+		//			warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		//		}
+		//
+		//	}
+		//}
 
-		}
+		//if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+		//	if (warehouse.StockMinNumber - deliver_number) > 0 {
+		//		warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
+		//	}
+		//}
 
 		if drup.MaxUnit != drup.MinUnit {
 			if warehouse.StockMaxNumber < 0 && warehouse.StockMinNumber < 0 {
@@ -739,9 +702,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		if warehouse.StockMinNumber <= 0 {
 			warehouse.StockMinNumber = 0
 		}
-		fmt.Println("stock_max_233232323223323233223323223", warehouse.StockMinNumber)
-		fmt.Println("stock_max_233232323223323233223323223", warehouse.StockMaxNumber)
-		//扣减库存232332332332
+		//扣减库存
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
 
 		if errThree != nil {
@@ -882,7 +843,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 
 		advice.PrescribingNumberUnit = advice.PrescribingNumberUnit
 
-		NewHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
+		HisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice)
 	}
 
 	return
@@ -956,6 +917,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			IsCheck:                 1,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
@@ -1084,6 +1046,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			IsCheck:                 1,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -2013,6 +1976,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			AdminUserId:             goods.AdminUserId,
 			BuyPrice:                warehouse.Price,
 			StockCount:              goods.StockCount,
+			IsCheck:                 1,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -2196,6 +2160,8 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 			Price:                   warehouse.PackingPrice,
 			LicenseNumber:           goods.LicenseNumber,
 			ConsumableType:          2,
+			IsCheck:                 1,
+			StorehouseId:            goods.StorehouseId,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -2309,6 +2275,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			AdviceId:                advice.ID,
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
 		}
 
 		drugflow := models.DrugFlow{
@@ -2344,15 +2311,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			return errOne
 		}
 		//查询是否存在数据
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//  errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//  if errOne != nil {
-		//    return errOne
-		//  }
-		//} else if errcodes == nil {
-		//  UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
+
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
@@ -2363,8 +2322,8 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			RecordTime:              advice.RecordDate,
 			OrgId:                   orgID,
 			DrugId:                  advice.DrugId,
-			Count:                   count,
-			CountUnit:               advice.PrescribingNumberUnit,
+			Count:                   deliver_number,
+			CountUnit:               drup.MinUnit,
 			WarehouseInfoId:         warehouse.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
 		}
@@ -2443,14 +2402,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 
 		errThree := UpDateDrugWarehouseInfoByStock(&warehouse)
-		//if(warehouse.StockMaxNumber > 0){
-		//  var sum_count int64
-		//  sum_count = warehouse.StockMaxNumber * drup.MinNumber
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,sum_count,warehouse.OrgId,warehouse.RetailPrice)
-		//}
-		//if(warehouse.StockMinNumber > 0){
-		//  ModifyDrugReduceInformationSix(warehouse.DrugId,warehouse.StockMinNumber,warehouse.OrgId,warehouse.RetailPrice)
-		//}
+
 		if errThree != nil {
 			return errThree
 		}
@@ -2482,21 +2434,12 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			WarehouseInfoId:         warehouse.ID,
 			AdviceId:                advice.ID,
 			StorehouseId:            storeConfig.DrugStorehouseOut,
+			IsCheck:                 1,
 		}
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
 			return errOne
 		}
-		//查询是否存在数据
-		//_, errcodes := GetDrugWarehouseOutInfoIsExit(advice.DrugId, advice.PatientId, advice.RecordDate)
-		//if errcodes == gorm.ErrRecordNotFound {
-		//  errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-		//  if errOne != nil {
-		//    return errOne
-		//  }
-		//} else if errcodes == nil {
-		//  UpdatedDrugWarehouseOutInfo(warehouseOutInfo, advice.DrugId, advice.PatientId, advice.RecordDate, advice.UserOrgId)
-		//}
 
 		details := &models.DrugAutomaticReduceDetail{
 			WarehouseOutId:          warehouseout.ID,
@@ -2519,9 +2462,9 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 
 		// 出库完成后，要将该批次库存清零
-		//warehouse.StockMaxNumber = 0
-		//warehouse.StockMinNumber = 0
-		//warehouse.Mtime = time.Now().Unix()
+		warehouse.StockMaxNumber = 0
+		warehouse.StockMinNumber = 0
+		warehouse.Mtime = time.Now().Unix()
 
 		info := models.XtDrugWarehouseInfo{
 			ID:                warehouse.ID,
@@ -2552,6 +2495,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			WarehousingInfoId: warehouse.WarehousingInfoId,
 			SupplyWarehouseId: warehouse.SupplyWarehouseId,
 			StorehouseId:      storeConfig.DrugStorehouseOut,
+			IsCheck:           1,
 		}
 		//扣减库存
 		errThree := UpDateDrugWarehouseInfoByStock(&info)
@@ -3151,6 +3095,8 @@ func HisAuToReduce(orgID int64, prescribingNumber float64, warehouseout *models.
 				BatchNumber:       warehouse.BatchNumber,
 				MaxUnit:           warehouse.MaxUnit,
 				WarehousingInfoId: warehouse.WarehousingInfoId,
+				StorehouseId:      storeConfig.DrugStorehouseOut,
+				IsCheck:           1,
 			}
 			errThree := UpDateDrugWarehouseInfoByStock(druginfo)
 			if errThree != nil {
@@ -3219,6 +3165,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			LicenseNumber:           goods.LicenseNumber,
 			SupplyCancelOutId:       warehouseOut.SupplyCancelOutId,
 			StorehouseId:            warehouse.StorehouseId,
+			IsCheck:                 1,
 		}
 		warehouseOutInfo.Count = goods.Count
 		//添加出库单详情
@@ -3306,6 +3253,7 @@ func ConsumablesDeliveryNight(orgID int64, record_time int64, goods *models.Ware
 			LicenseNumber:           goods.LicenseNumber,
 			SupplyCancelOutId:       warehouseOut.SupplyCancelOutId,
 			StorehouseId:            warehouse.StorehouseId,
+			IsCheck:                 1,
 		}
 		warehouseOutInfo.Count = stock_number
 
@@ -3854,6 +3802,7 @@ func ConsumablesDeliveryTwelve(orgID int64, record_time int64, goods *models.War
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            warehouse.StorehouseId,
 			SecondWarehouseInfoId:   goods.SecondWarehouseInfoId,
+			IsCheck:                 1,
 		}
 		warehouseOutInfo.Count = warehouse.StockCount
 
@@ -4458,6 +4407,7 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			IsCheck:                 1,
 		}
 
 		if warehouse.RetailPrice == 0 {
@@ -4630,6 +4580,7 @@ func AutoDrugDeliverInfoTwenty(orgID int64, prescribingNumber int64, warehouseou
 			SupplyWarehouseId:       warehouse.SupplyWarehouseId,
 			StorehouseId:            advice.StorehouseId,
 			AdminUserId:             advice.AdminUserId,
+			IsCheck:                 1,
 		}
 		if warehouse.RetailPrice == 0 {
 			warehouseOutInfo.Price = advice.Price
@@ -4781,6 +4732,7 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 			AdminUserId:             advice.AdminUserId,
 			LastPrice:               warehouse.Price,
 			StockCount:              advice.StockCount,
+			IsCheck:                 1,
 		}
 
 		warehouseOutInfo.Count = prescribingNumber
@@ -4951,6 +4903,7 @@ func AutoDrugDeliverInfoTwentyOne(orgID int64, prescribingNumber int64, warehous
 			AdminUserId:             advice.AdminUserId,
 			LastPrice:               warehouse.Price,
 			StockCount:              advice.StockCount,
+			IsCheck:                 1,
 		}
 
 		warehouseOutInfo.Count = stock_number