医保对接

controllers/drug_stock_api_contorller.go

@@ -183,18 +183,8 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				}
 
-				if items["lot_number"] == nil || reflect.TypeOf(items["lot_number"]).String() != "string" {
-					utils.ErrorLog("lot_number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				lot_number, _ := items["lot_number"].(string)
 
-				if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
-					utils.ErrorLog("batch_number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				batch_number, _ := items["batch_number"].(string)
 
 				if items["max_unit"] == nil || reflect.TypeOf(items["max_unit"]).String() != "string" {
@@ -465,6 +455,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 	}
 
 	warehousingInfo, err := service.FindDrugWarehousingInfoById(id, admin.CurrentOrgId)
+	fmt.Println("warehousinginfo000000000000000", warehousingInfo)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"info":             warehousingInfo,
@@ -612,11 +603,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				number, _ := items["lot_number"].(string)
 
-				if items["batch_number"] == nil || reflect.TypeOf(items["batch_number"]).String() != "string" {
-					utils.ErrorLog("batch_number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				batch_number, _ := items["batch_number"].(string)
 
 				max_unit, _ := items["max_unit"].(string)
@@ -1227,8 +1213,6 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				remark := items["remark"].(string)
 				max_unit := items["max_unit"].(string)
 
-				fmt.Println("包装单位999999999999", max_unit)
-
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1254,29 +1238,30 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	}
 
 	//调用出库逻辑
-	for _, item := range warehousingOutInfo {
-
-		// 出库流程
-		// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
-		drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
-		if drup.ID > 0 {
-			prescribingNumber := item.Count
-
-			service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
-
-		}
+	//for _, item := range warehousingOutInfo {
+	//
+	//	// 出库流程
+	//	// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+	//	drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
+	//	if drup.ID > 0 {
+	//		prescribingNumber := item.Count
+	//
+	//		service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
+	//
+	//	}
+	//
+	//}
 
+	errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+	info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+		return
 	}
 
-	//errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-	//info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	//if errs != nil {
-	//	utils.ErrorLog(errs.Error())
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-	//	return
-	//}
-
 	c.ServeSuccessJSON(map[string]interface{}{
+		"info":                  info,
 		"msg":                   "出库成功",
 		"warehousing_out_order": warehousing_out_order,
 	})
@@ -1999,6 +1984,7 @@ func (this *StockDrugApiController) GetUserDetailInfo() {
 	}
 	adminUserInfo := this.GetAdminUserInfo()
 	userDetails, err, total := service.FindDrugStockUserDetailById(adminUserInfo.CurrentOrgId, order_id)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  userDetails,

controllers/gobal_config_api_controller.go

@@ -95,6 +95,12 @@ func GobalConfigRegistRouters() {
 
 	beego.Router("/api/drugoutstock/getoutdrugstockflow", &GobalConfigApiController{}, "Get:GetDrugOutStockFlow")
 	beego.Router("/api/drug/getbatchorderdetail", &GobalConfigApiController{}, "Get:GetBatchOrderDetail")
+
+	beego.Router("/api/drug/getdrugcountlist", &GobalConfigApiController{}, "Get:GetDrugCountList")
+	beego.Router("/api/drug/getsingleorderdetail", &GobalConfigApiController{}, "Get:GetSingleOrderDetail")
+	beego.Router("/api/drug/getautodrugdetial", &GobalConfigApiController{}, "Get:GetAutoDrugDetail")
+	beego.Router("/api/drug/getdrugorderinprint", &GobalConfigApiController{}, "Get:GetDrugOrderInPrint")
+	beego.Router("/api/drug/getdrugoutorderdetailprint", &GobalConfigApiController{}, "Get:GetDrugOutOrderPrint")
 }
 
 //provinces, _ := service.GetDistrictsByUpid(0)21
@@ -1783,14 +1789,16 @@ func (c *GobalConfigApiController) GetDrugAutoMaticList() {
 	drugConfig, _ := service.GetDrugStockConfig(orgId)
 	list, err := service.GetDrugAutoMaticList(orgId, warehous_out_id, record_time, warehouse_out_order_number)
 	drugList, err := service.GetAllBaseDrugList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":       list,
-		"drugConfig": drugConfig,
-		"drugList":   drugList,
+		"list":             list,
+		"drugConfig":       drugConfig,
+		"drugList":         drugList,
+		"manufacturerList": manufacturerList,
 	})
 }
 
@@ -1809,7 +1817,7 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	page, _ := c.GetInt64("page", -1)
 	limit, _ := c.GetInt64("limit", -1)
 	keyword := c.GetString("keyword")
-	drug_category, _ := c.GetInt64("drug_category")
+	drug_type, _ := c.GetInt64("drug_type")
 	start_time := c.GetString("start_time")
 	end_time := c.GetString("end_time")
 	timeLayout := "2006-01-02"
@@ -1838,7 +1846,7 @@ func (c *GobalConfigApiController) GetDrugStockList() {
 	adminUserInfo := c.GetAdminUserInfo()
 
 	//查询入库数量
-	list, total, err := service.GetDrugStockList(page, limit, keyword, drug_category, startTime, endTime, adminUserInfo.CurrentOrgId)
+	list, total, err := service.GetDrugStockList(page, limit, keyword, drug_type, startTime, endTime, adminUserInfo.CurrentOrgId)
 	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
@@ -1932,18 +1940,18 @@ func (c *GobalConfigApiController) GetDrugOutStockFlow() {
 		endTime = theTime.Unix()
 	}
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	if stock_type >= 0 && stock_type != 3 {
-		outList, total, err := service.GetDrugStockOutFlow(drug_id, startTime, endTime, page, limit, orgId, stock_type)
 
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
-			return
-		}
-		c.ServeSuccessJSON(map[string]interface{}{
-			"outList": outList,
-			"total":   total,
-		})
+	outList, total, err := service.GetDrugStockOutFlow(drug_id, startTime, endTime, page, limit, orgId, stock_type)
+
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
 	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"outList": outList,
+		"total":   total,
+	})
+
 }
 
 func (c *GobalConfigApiController) GetBatchOrderDetail() {
@@ -1952,7 +1960,7 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	limit, _ := c.GetInt64("limit")
 	page, _ := c.GetInt64("page")
-	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, limit, page)
+	detail, total, err := service.GetBatchOrderDetail(drug_id, orgId, page, limit)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
@@ -1962,3 +1970,112 @@ func (c *GobalConfigApiController) GetBatchOrderDetail() {
 		"total":  total,
 	})
 }
+
+func (c *GobalConfigApiController) GetDrugCountList() {
+
+	start_time := c.GetString("start_time")
+
+	end_time := c.GetString("end_time")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			fmt.Println(err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetDrugCountList(startTime, endTime, orgId)
+	countList, err := service.GetMinCountList(startTime, endTime, orgId)
+	outCountList, _ := service.GetOutDrugCountList(startTime, endTime, orgId)
+	auCountList, err := service.GetAutoDrugCountList(startTime, endTime, orgId)
+	info, _ := service.GetDrugWarehouOrderInfo(startTime, endTime, orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"countList":    list,
+		"outCountList": outCountList,
+		"auCountList":  auCountList,
+		"minCount":     countList,
+		"info":         info,
+	})
+}
+
+func (c *GobalConfigApiController) GetSingleOrderDetail() {
+
+	id, _ := c.GetInt64("id")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetSingleOrderDetail(id, orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (c *GobalConfigApiController) GetAutoDrugDetail() {
+
+	id, _ := c.GetInt64("drug_id")
+	record_time, _ := c.GetInt64("record_time")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	list, err, total := service.FindDrugStockUserDetailByIdThree(id, record_time, orgId)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"total": total,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugOrderInPrint() {
+
+	id := c.GetString("id")
+	ids := strings.Split(id, ",")
+	admin := c.GetAdminUserInfo()
+
+	info, _ := service.FindDrugWarehousingByIdOne(ids, admin.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
+
+	warehousingInfo, _ := service.FindDrugWarehousingInfoByIdOne(ids, admin.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":             info,
+		"warehousing":      warehousingInfo,
+		"manufacturerList": manufacturerList,
+	})
+}
+
+func (c *GobalConfigApiController) GetDrugOutOrderPrint() {
+	id := c.GetString("id")
+	ids := strings.Split(id, ",")
+	admin := c.GetAdminUserInfo()
+	info, _ := service.FindeDrugWarehouseOutOrder(ids, admin.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
+	warehousing, _ := service.FindeDrugWarehouseOutDetail(ids, admin.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"info":             info,
+		"warehousing":      warehousing,
+		"manufacturerList": manufacturerList,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -335,7 +335,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 || template.TemplateId == 36 {
+	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 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -161,4 +161,6 @@ func MobileAPIControllersRegisterRouters() {
 	//医嘱批量执行
 	beego.Router("/m/api/batchadviceexecution", &DialysisAPIController{}, "Get:BatchAdviceExecution")
 
+	beego.Router("/m/api/updatestockgoods", &DialysisAPIController{}, "Get:UpdateStockGoods")
+
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -541,19 +541,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		adminUserInfo := c.GetMobileAdminUserInfo()
 
-		//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
-		//
-		//if appRole.UserType == 2 || appRole.UserType == 1 {
-		//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		//	if getPermissionErr != nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		//		return
-		//	} else if headNursePermission == nil {
-		//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDialysisPermissionDeniedModify)
-		//		return
-		//	}
-		//}
-
 		var advice models.DoctorAdvice
 
 		if groupno > 0 {
@@ -561,7 +548,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			for _, item := range advices {
 				if item.ExecutionState == 2 {
 					advice = item
-
 				}
 			}
 		} else {
@@ -569,7 +555,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			for _, item := range advices {
 				if item.ExecutionState == 2 {
 					advice = item
-
 				}
 			}
 		}
@@ -628,327 +613,34 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 				isHasWay := false //用来判断是否包含来自药品库的医嘱
-				record_time := int64(0)
 				for _, item := range advices {
 					if item.Way == 1 {
 						isHasWay = true
-						record_time = item.RecordDate
 					}
 				}
 
 				if isHasWay {
-					_, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
-					if err == gorm.ErrRecordNotFound {
-						//没有记录，则创建出库单
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
-						total = total + 1
-						warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-						number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-						number = number + total
-						warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-						creater := adminUserInfo.AdminUser.Id
-						warehouseOut := models.DrugWarehouseOut{
-							WarehouseOutOrderNumber: warehousing_out_order,
-							OperationTime:           time.Now().Unix(),
-							OrgId:                   adminUserInfo.Org.Id,
-							Creater:                 creater,
-							Ctime:                   time.Now().Unix(),
-							Status:                  1,
-							WarehouseOutTime:        record_time,
-							Dealer:                  0,
-							Manufacturer:            0,
-							Type:                    1,
-							IsSys:                   1,
-						}
-						err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-						if err != nil {
-							utils.TraceLog("创建出库单失败 err = %v", err)
-						} else {
-							for _, item := range advices {
-								if item.Way == 1 {
-
-									service.DrugsDelivery(item.UserOrgId, &item)
-
-									//if item.PrescribingNumber > 0 {
-									//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
-									//		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-									//		WarehouseOutId:          warehouseOut.ID,
-									//		Status:                  1,
-									//		Ctime:                   time.Now().Unix(),
-									//		Remark:                  "",
-									//		OrgId:                   adminUserInfo.Org.Id,
-									//		Type:                    1,
-									//		Manufacturer:            0,
-									//		Dealer:                  0,
-									//		IsSys:                   1,
-									//		SysRecordTime:           record_time,
-									//		DrugId:                  item.DrugId,
-									//	}
-									//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									//	warehouseOutInfo.Count = count
-									//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-									//	warehouseOutInfo.Price = stockInInfo.Price
-									//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-									//	if err == nil {
-									//		details := &models.DrugAutomaticReduceDetail{
-									//			WarehouseOutId:          warehouseOutInfo.ID,
-									//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-									//			PatientId:               item.PatientId,
-									//			Ctime:                   time.Now().Unix(),
-									//			Mtime:                   time.Now().Unix(),
-									//			Status:                  1,
-									//			RecordTime:              record_time,
-									//			OrgId:                   adminUserInfo.Org.Id,
-									//			DrugId:                  item.DrugId,
-									//			Count:                   count,
-									//		}
-									//		service.AddSigleDrugAutoReduceRecordInfo(details)
-									//	}
-									//}
-								}
-
-							}
-						}
-
-					} else if err == nil {
-						for _, item := range advices {
-							if item.Way == 1 {
-								service.DrugsDelivery(item.UserOrgId, &item)
-								//outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-								//if err == gorm.ErrRecordNotFound {
-								//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
-								//		WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-								//		WarehouseOutId:          out.ID,
-								//		Status:                  1,
-								//		Ctime:                   time.Now().Unix(),
-								//		Remark:                  "",
-								//		OrgId:                   adminUserInfo.Org.Id,
-								//		Type:                    1,
-								//		Manufacturer:            0,
-								//		Dealer:                  0,
-								//		IsSys:                   1,
-								//		SysRecordTime:           record_time,
-								//	}
-								//
-								//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-								//	warehouseOutInfo.Price = stockInInfo.Price
-								//	warehouseOutInfo.DrugId = item.DrugId
-								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								//	warehouseOutInfo.Count = count
-								//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-								//	if err == nil {
-								//		details := &models.DrugAutomaticReduceDetail{
-								//			WarehouseOutId:          warehouseOutInfo.ID,
-								//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-								//			PatientId:               item.PatientId,
-								//			Ctime:                   time.Now().Unix(),
-								//			Mtime:                   time.Now().Unix(),
-								//			Status:                  1,
-								//			RecordTime:              record_time,
-								//			OrgId:                   adminUserInfo.Org.Id,
-								//			DrugId:                  item.DrugId,
-								//			Count:                   count,
-								//		}
-								//		service.AddSigleDrugAutoReduceRecordInfo(details)
-								//	}
-								//
-								//} else if err == nil { //记录存在，则将增加数量
-								//	if outInfo.ID > 0 {
-								//		prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								//		count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								//		service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
-								//	}
-								//
-								//	//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
-								//	//if count == 0 {
-								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								//	details := &models.DrugAutomaticReduceDetail{
-								//		WarehouseOutId:          outInfo.ID,
-								//		WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-								//		PatientId:               item.PatientId,
-								//		Ctime:                   time.Now().Unix(),
-								//		Mtime:                   time.Now().Unix(),
-								//		Status:                  1,
-								//		RecordTime:              record_time,
-								//		OrgId:                   adminUserInfo.Org.Id,
-								//		DrugId:                  item.DrugId,
-								//		Count:                   count,
-								//	}
-								//	service.AddSigleDrugAutoReduceRecordInfo(details)
-								//
-								//}
-							}
+					for _, item := range advices {
+						if item.Way == 1 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 						}
-
 					}
-
 				}
 			} else {
 				advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 				isHasWay := false //用来判断是否包含来自药品库的医嘱
-				record_time := int64(0)
+
 				for _, item := range advices {
 					if item.Way == 1 {
 						isHasWay = true
-						record_time = item.RecordDate
 					}
 				}
-
 				if isHasWay {
-					_, err := service.FindDrugStockOutByIsSys(adminUserInfo.Org.Id, 1, record_time)
-					if err == gorm.ErrRecordNotFound {
-						//没有记录，则创建出库单
-						timeStr := time.Now().Format("2006-01-02")
-						timeArr := strings.Split(timeStr, "-")
-						total, _ := service.FindAllDrugWarehouseOut(adminUserInfo.Org.Id)
-						total = total + 1
-						warehousing_out_order := strconv.FormatInt(adminUserInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-						number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-						number = number + total
-						warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-						creater := adminUserInfo.AdminUser.Id
-						warehouseOut := models.DrugWarehouseOut{
-							WarehouseOutOrderNumber: warehousing_out_order,
-							OperationTime:           time.Now().Unix(),
-							OrgId:                   adminUserInfo.Org.Id,
-							Creater:                 creater,
-							Ctime:                   time.Now().Unix(),
-							Status:                  1,
-							WarehouseOutTime:        record_time,
-							Dealer:                  0,
-							Manufacturer:            0,
-							Type:                    1,
-							IsSys:                   1,
-						}
-						err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-						if err != nil {
-							utils.TraceLog("创建出库单失败 err = %v", err)
-						} else {
-							for _, item := range advices {
-								if item.Way == 1 {
-									service.DrugsDelivery(item.UserOrgId, &item)
-									//if item.PrescribingNumber > 0 {
-									//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
-									//		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-									//		WarehouseOutId:          warehouseOut.ID,
-									//		Status:                  1,
-									//		Ctime:                   time.Now().Unix(),
-									//		Remark:                  "",
-									//		OrgId:                   adminUserInfo.Org.Id,
-									//		Type:                    1,
-									//		Manufacturer:            0,
-									//		Dealer:                  0,
-									//		IsSys:                   1,
-									//		SysRecordTime:           record_time,
-									//		DrugId:                  item.DrugId,
-									//	}
-									//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-									//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-									//	warehouseOutInfo.Count = count
-									//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-									//	warehouseOutInfo.Price = stockInInfo.Price
-									//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-									//	if err == nil {
-									//		details := &models.DrugAutomaticReduceDetail{
-									//			WarehouseOutId:          warehouseOutInfo.ID,
-									//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-									//			PatientId:               item.PatientId,
-									//			Ctime:                   time.Now().Unix(),
-									//			Mtime:                   time.Now().Unix(),
-									//			Status:                  1,
-									//			RecordTime:              record_time,
-									//			OrgId:                   adminUserInfo.Org.Id,
-									//			DrugId:                  item.DrugId,
-									//			Count:                   count,
-									//		}
-									//		service.AddSigleDrugAutoReduceRecordInfo(details)
-									//	}
-									//}
-								}
-
-							}
+					for _, item := range advices {
+						if item.Way == 1 {
+							service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 						}
-
-					} else if err == nil {
-						for _, item := range advices {
-							if item.Way == 1 {
-								service.DrugsDelivery(item.UserOrgId, &item)
-								//outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
-								//if err == gorm.ErrRecordNotFound {
-								//	warehouseOutInfo := &models.DrugWarehouseOutInfo{
-								//		WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-								//		WarehouseOutId:          out.ID,
-								//		Status:                  1,
-								//		Ctime:                   time.Now().Unix(),
-								//		Remark:                  "",
-								//		OrgId:                   adminUserInfo.Org.Id,
-								//		Type:                    1,
-								//		Manufacturer:            0,
-								//		Dealer:                  0,
-								//		IsSys:                   1,
-								//		SysRecordTime:           record_time,
-								//	}
-								//
-								//	stockInInfo, _ := service.FindLastDrugStockInInfoRecord(item.DrugId, adminUserInfo.Org.Id)
-								//	warehouseOutInfo.Price = stockInInfo.Price
-								//	warehouseOutInfo.DrugId = item.DrugId
-								//	//warehouseOutInfo.Count = item.
-								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								//	err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-								//	if err == nil {
-								//		details := &models.DrugAutomaticReduceDetail{
-								//			WarehouseOutId:          warehouseOutInfo.ID,
-								//			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-								//			PatientId:               item.PatientId,
-								//			Ctime:                   time.Now().Unix(),
-								//			Mtime:                   time.Now().Unix(),
-								//			Status:                  1,
-								//			RecordTime:              record_time,
-								//			OrgId:                   adminUserInfo.Org.Id,
-								//			DrugId:                  item.DrugId,
-								//			Count:                   count,
-								//		}
-								//		service.AddSigleDrugAutoReduceRecordInfo(details)
-								//	}
-								//
-								//} else if err == nil { //记录存在，则将增加数量
-								//	if outInfo.ID > 0 {
-								//		prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								//		count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								//		service.UpdateDrugStockOutInfoCount2(adminUserInfo.Org.Id, outInfo.ID, count)
-								//	}
-								//
-								//	//count, _ := service.FindPatientDrugAutomaticReduceRecord(adminUserInfo.Org.Id, record_time, item.DrugId, item.PatientId)
-								//	//if count == 0 {
-								//	prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
-								//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-								//	details := &models.DrugAutomaticReduceDetail{
-								//		WarehouseOutId:          outInfo.ID,
-								//		WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-								//		PatientId:               item.PatientId,
-								//		Ctime:                   time.Now().Unix(),
-								//		Mtime:                   time.Now().Unix(),
-								//		Status:                  1,
-								//		RecordTime:              record_time,
-								//		OrgId:                   adminUserInfo.Org.Id,
-								//		DrugId:                  item.DrugId,
-								//		Count:                   count,
-								//	}
-								//	service.AddSigleDrugAutoReduceRecordInfo(details)
-								//
-								//
-								//}
-							}
-						}
-
 					}
-
 				}
 			}
 		}
@@ -1070,6 +762,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			return
 		}
 		adminInfo := c.GetMobileAdminUserInfo()
+		creater := c.GetMobileAdminUserInfo().AdminUser.Id
 		advice_id, _ := c.GetInt64("advice_id")
 		advices, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
 		if advices.ExecutionState == 1 {
@@ -1096,143 +789,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			fmt.Println("drugstockconfig000000000000000000000000", drugStockConfig.IsOpen)
 			if drugStockConfig.IsOpen == 1 {
 				advice, _ := service.FindHisDoctorAdviceById(adminInfo.Org.Id, advice_id)
-				record_time := advice.RecordDate
-
-				out, err := service.FindDrugStockOutByIsSys(adminInfo.Org.Id, 1, record_time)
-				if err == gorm.ErrRecordNotFound {
-					//没有记录，则创建出库单
-					timeStr := time.Now().Format("2006-01-02")
-					timeArr := strings.Split(timeStr, "-")
-					total, _ := service.FindAllDrugWarehouseOut(adminInfo.Org.Id)
-					total = total + 1
-					warehousing_out_order := strconv.FormatInt(adminInfo.Org.Id, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
-					number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
-					number = number + total
-					warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
-					creater := adminInfo.AdminUser.Id
-					warehouseOut := models.DrugWarehouseOut{
-						WarehouseOutOrderNumber: warehousing_out_order,
-						OperationTime:           time.Now().Unix(),
-						OrgId:                   adminInfo.Org.Id,
-						Creater:                 creater,
-						Ctime:                   time.Now().Unix(),
-						Status:                  1,
-						WarehouseOutTime:        record_time,
-						Dealer:                  0,
-						Manufacturer:            0,
-						Type:                    1,
-						IsSys:                   1,
-					}
-					err := service.AddSigleDrugWarehouseOut(&warehouseOut)
-					if err != nil {
-						utils.TraceLog("创建出库单失败 err = %v", err)
-					} else {
-						if advice.PrescribingNumber > 0 {
-							warehouseOutInfo := &models.DrugWarehouseOutInfo{
-								WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-								WarehouseOutId:          warehouseOut.ID,
-								Status:                  1,
-								Ctime:                   time.Now().Unix(),
-								Remark:                  "",
-								OrgId:                   adminInfo.Org.Id,
-								Type:                    1,
-								Manufacturer:            0,
-								Dealer:                  0,
-								IsSys:                   1,
-								SysRecordTime:           record_time,
-								DrugId:                  advice.DrugId,
-							}
-							prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-							count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-							warehouseOutInfo.Count = count
-							stockInInfo, _ := service.FindLastDrugStockInInfoRecord(advice.DrugId, adminInfo.Org.Id)
-							warehouseOutInfo.Price = stockInInfo.Price
-							err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-
-							if err == nil {
-								service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
-								//details := &models.DrugAutomaticReduceDetail{
-								//	WarehouseOutId:          warehouseOutInfo.ID,
-								//	WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-								//	PatientId:               advice.PatientId,
-								//	Ctime:                   time.Now().Unix(),
-								//	Mtime:                   time.Now().Unix(),
-								//	Status:                  1,
-								//	RecordTime:              record_time,
-								//	OrgId:                   adminInfo.Org.Id,
-								//	DrugId:                  advice.DrugId,
-								//	Count:                   count,
-								//}
-								//service.AddSigleDrugAutoReduceRecordInfo(details)
-							}
-						}
-					}
-
-				} else if err == nil {
-					_, err := service.FindDrugStockOutInfoByTypeId(adminInfo.Org.Id, advice.DrugId, out.ID, out.WarehouseOutOrderNumber)
-					if err == gorm.ErrRecordNotFound {
-						warehouseOutInfo := &models.DrugWarehouseOutInfo{
-							WarehouseOutOrderNumber: out.WarehouseOutOrderNumber,
-							WarehouseOutId:          out.ID,
-							Status:                  1,
-							Ctime:                   time.Now().Unix(),
-							Remark:                  "",
-							OrgId:                   adminInfo.Org.Id,
-							Type:                    1,
-							Manufacturer:            0,
-							Dealer:                  0,
-							IsSys:                   1,
-							SysRecordTime:           record_time,
-						}
-
-						stockInInfo, _ := service.FindLastDrugStockInInfoRecord(advice.DrugId, adminInfo.Org.Id)
-						warehouseOutInfo.Price = stockInInfo.Price
-						warehouseOutInfo.DrugId = advice.DrugId
-						prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						warehouseOutInfo.Count = count
-						err := service.AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
-						if err == nil {
-							service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
-							//details := &models.DrugAutomaticReduceDetail{
-							//	WarehouseOutId:          warehouseOutInfo.ID,
-							//	WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-							//	PatientId:               advice.PatientId,
-							//	Ctime:                   time.Now().Unix(),
-							//	Mtime:                   time.Now().Unix(),
-							//	Status:                  1,
-							//	RecordTime:              record_time,
-							//	OrgId:                   adminInfo.Org.Id,
-							//	DrugId:                  advice.DrugId,
-							//	Count:                   count,
-							//}
-							//service.AddSigleDrugAutoReduceRecordInfo(details)
-						}
-
-					} else if err == nil { //记录存在，则将增加数量
-						service.HisDrugsDelivery(adminInfo.Org.Id, &advice)
-						//if outInfo.ID > 0 {
-						//	prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						//	count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						//	service.UpdateDrugStockOutInfoCount2(adminInfo.Org.Id, outInfo.ID, count)
-						//}
-						//prescribingNumber := strconv.FormatFloat(math.Abs(advice.PrescribingNumber), 'f', 0, 64)
-						//count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
-						//details := &models.DrugAutomaticReduceDetail{
-						//	WarehouseOutId:          outInfo.ID,
-						//	WarehouseOutOrderNumber: outInfo.WarehouseOutOrderNumber,
-						//	PatientId:               advice.PatientId,
-						//	Ctime:                   time.Now().Unix(),
-						//	Mtime:                   time.Now().Unix(),
-						//	Status:                  1,
-						//	RecordTime:              record_time,
-						//	OrgId:                   adminInfo.Org.Id,
-						//	DrugId:                  advice.DrugId,
-						//	Count:                   count,
-						//}
-						//service.AddSigleDrugAutoReduceRecordInfo(details)
-					}
-				}
+				service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
 			}
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":    "ok",

controllers/patient_api_controller.go

@@ -1234,6 +1234,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		}
 
 		if adviceNameM["template_id"] != nil && reflect.TypeOf(adviceNameM["template_id"]).String() == "string" {
+
 			template_id, _ := adviceNameM["template_id"].(string)
 			advice.TemplateId = template_id
 		}
@@ -1570,7 +1571,6 @@ func (c *PatientApiController) ExecGroupAdvice() {
 
 func (c *PatientApiController) ExecDoctorAdvice() {
 
-	fmt.Println("hhhhhhhhhhhhhhh9999999999")
 	origin, _ := c.GetInt64("origin", 0)
 
 	patient, _ := c.GetInt64("patient", 0)
@@ -1649,10 +1649,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		//药品管理信息
 		_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
-
+		fmt.Println("999999992322322323232", drugStockConfig.IsOpen)
 		//自备药信息
 		privateDrugConfig, _ := service.GetDrugSetByUserOrgId(adminUserInfo.CurrentOrgId)
-		fmt.Println("9999999999999999999999999", drugStockConfig.IsOpen)
+
 		if drugStockConfig.IsOpen == 1 {
 			//查询已经执行的医嘱
 			//advices, _ := service.GetExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
@@ -1856,7 +1856,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			for _, item := range advices {
 				fmt.Println("imte00000000000000", item.PrescribingNumber)
 				//调用药品出库接口
-				service.DrugsDelivery(item.UserOrgId, item)
+				service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
 				//if item.Way == 1 {
 				//	out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
@@ -2180,7 +2180,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			advices, _ := service.GetHisExecutionDoctors(adminUserInfo.CurrentOrgId, patient, id)
 			for _, item := range advices {
 
-				service.HisDrugsDelivery(item.UserOrgId, item)
+				service.HisDrugsDelivery(item.UserOrgId, item.ExecutionStaff, item)
 
 				//out, err := service.FindDrugStockOutByIsSys(adminUserInfo.CurrentOrgId, 1, item.RecordDate)
 				//if err == gorm.ErrRecordNotFound {

controllers/patient_dataconfig_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -14,9 +15,9 @@ import (
 
 func PatientDataConfigAPIControllerRegistRouters() {
 	beego.Router("/api/patient/courses", &PatientDataConfigAPIController{}, "get:Courses")
-	beego.Router("/api/patient/course/create", &PatientDataConfigAPIController{}, "post:CreateCourse")
+	beego.Router("/api/patient/course/create", &PatientDataConfigAPIController{}, "get:CreateCourse")
 	beego.Router("/api/patient/course/delete", &PatientDataConfigAPIController{}, "post:DeleteCourse")
-	beego.Router("/api/patient/course/modify", &PatientDataConfigAPIController{}, "post:ModifyCourse")
+	beego.Router("/api/patient/course/modify", &PatientDataConfigAPIController{}, "get:ModifyCourse")
 
 	beego.Router("/api/patient/rescues", &PatientDataConfigAPIController{}, "get:Rescues")
 	beego.Router("/api/patient/rescue/create", &PatientDataConfigAPIController{}, "post:CreateRescue")
@@ -83,7 +84,9 @@ func (this *PatientDataConfigAPIController) Courses() {
 // @param content:string
 func (this *PatientDataConfigAPIController) CreateCourse() {
 	patientID, _ := this.GetInt64("patient_id")
+	fmt.Println(patientID)
 	content := this.GetString("content")
+	fmt.Println("content22222222222222222222", content)
 	record_time_str := this.GetString("record_time")
 	title := this.GetString("title")
 

controllers/stock_in_api_controller.go

@@ -83,13 +83,20 @@ func StockManagerApiRegistRouters() {
 
 	beego.Router("/api/stock/getstocklistbyid", &StockManagerApiController{}, "Get:GetStockListById")
 	beego.Router("/api/stock/getstockoutlist", &StockManagerApiController{}, "Get:GetStockOutList")
+
+	beego.Router("/api/good/getstockdrugcount", &StockManagerApiController{}, "Get:GetStockDrugCount")
+
+	beego.Router("/api/good/getorderdetialbyorderid", &StockManagerApiController{}, "Get:GetOrderDetialByOrderId")
+	beego.Router("/api/good/getorderdetaibyid", &StockManagerApiController{}, "Get:GetOrderDetailById")
+	beego.Router("/api/good/getsingleoutorderdetail", &StockManagerApiController{}, "Get:GetSingleOutOrderDetail")
+	beego.Router("/api/stock/getexportstocklist", &StockManagerApiController{}, "Get:GetExprotStockList")
+	beego.Router("/api/stock/getoutexprotlist", &StockManagerApiController{}, "Get:GetOutExprotList")
+
 }
 
 func (c *StockManagerApiController) CreateWarehouse() {
 
 	warehousing_time := c.GetString("warehousing_time")
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
 
 	types, _ := c.GetInt64("type", 0)
 
@@ -117,8 +124,6 @@ func (c *StockManagerApiController) CreateWarehouse() {
 		Ctime:            ctime,
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
-		Dealer:           dealer_id,
-		Manufacturer:     manufacturer_id,
 		Type:             types,
 	}
 	service.AddSigleWarehouse(&warehousing)
@@ -205,6 +210,10 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 				remark, _ := items["remark"].(string)
 
+				manufacturer := int64(items["manufacturer"].(float64))
+				dealer := int64(items["dealer"].(float64))
+
+				license_number, _ := items["license_number"].(string)
 				warehouseInfo := &models.WarehousingInfo{
 					WarehousingOrder: warehousing.WarehousingOrder,
 					WarehousingId:    warehousing.ID,
@@ -221,9 +230,10 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					Remark:           remark,
 					OrgId:            adminUserInfo.CurrentOrgId,
 					Type:             types,
-					Manufacturer:     manufacturer_id,
-					Dealer:           dealer_id,
+					Manufacturer:     manufacturer,
 					StockCount:       warehousing_count,
+					Dealer:           dealer,
+					LicenseNumber:    license_number,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -388,10 +398,6 @@ func (c *StockManagerApiController) GetWarehouseList() {
 	end_time := c.GetString("end_time")
 	types, _ := c.GetInt64("type", 0)
 	keywords := c.GetString("keywords")
-
-	fmt.Println(start_time)
-	fmt.Println(end_time)
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -416,7 +422,25 @@ func (c *StockManagerApiController) GetWarehouseList() {
 	}
 
 	adminUserInfo := c.GetAdminUserInfo()
-	warehouseList, total, err := service.FindAllWarehousingList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords)
+	var ids []int64
+	var goodids []int64
+	//查询商品名称
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetGoodInforByGoodName(keywords, adminUserInfo.CurrentOrgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+			//入库详情但里面查询
+		}
+		if len(goodids) > 0 {
+			info, _ := service.GetWarehoureOrderInfoByGoodId(goodids, startTime, endTime, adminUserInfo.CurrentOrgId)
+			for _, it := range info {
+				ids = append(ids, it.WarehousingId)
+			}
+		}
+	}
+
+	warehouseList, total, err := service.FindAllWarehousingList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  warehouseList,
@@ -427,25 +451,23 @@ func (c *StockManagerApiController) GetWarehouseList() {
 	}
 }
 func (c *StockManagerApiController) GetWarehouseInfoList() {
-	id, _ := c.GetInt64("id", 0)
 
-	if id <= 0 {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-
-	warehousing, err := service.FindWarehousingById(id)
+	id := c.GetString("id")
+	idArray := strings.Split(id, ",")
+	warehousing, err := service.FindWarehousingByIdOne(idArray)
 
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
-	if warehousing.ID <= 0 {
-		return
+	var ids []int64
+
+	for _, item := range warehousing {
+		ids = append(ids, item.ID)
 	}
 
-	warehousingInfo, err := service.FindWarehousingInfoById(id)
+	warehousingInfo, err := service.FindWarehousingInfoByIdOne(ids)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"info":        warehousingInfo,
@@ -459,8 +481,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 	warehousing_time := c.GetString("warehousing_time")
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -488,8 +508,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
 		Type:             warehouse.Type,
-		Dealer:           dealer_id,
-		Manufacturer:     manufacturer_id,
 	}
 
 	service.EditWarehousing(warehousing)
@@ -578,6 +596,9 @@ func (c *StockManagerApiController) EditWarehouse() {
 
 				remark, _ := items["remark"].(string)
 
+				manufacturer := int64(items["manufacturer"].(float64))
+				dealer := int64(items["dealer"].(float64))
+				license_number, _ := items["license_number"].(string)
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -602,8 +623,10 @@ func (c *StockManagerApiController) EditWarehouse() {
 						Remark:           remark,
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
+						StockCount:       warehousing_count,
+						LicenseNumber:    license_number,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -625,8 +648,10 @@ func (c *StockManagerApiController) EditWarehouse() {
 						Remark:           remark,
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
+						StockCount:       warehousing_count,
+						LicenseNumber:    license_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 				}
@@ -1037,8 +1062,7 @@ func (c *StockManagerApiController) EditReturnInfo() {
 }
 
 func (c *StockManagerApiController) CreateWarehouseOut() {
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
+
 	types, _ := c.GetInt64("type", 0)
 
 	ctime := time.Now().Unix()
@@ -1063,6 +1087,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
 
+	_, errcode := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
 	warehouseOut := models.WarehouseOut{
 		WarehouseOutOrderNumber: warehousing_out_order,
 		OperationTime:           operation_time,
@@ -1071,11 +1096,12 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 		Ctime:                   ctime,
 		Status:                  1,
 		WarehouseOutTime:        warehousingOutDate.Unix(),
-		Dealer:                  dealer_id,
-		Manufacturer:            manufacturer_id,
 		Type:                    types,
 	}
-	service.AddSigleWarehouseOut(&warehouseOut)
+	if errcode == gorm.ErrRecordNotFound {
+		service.AddSigleWarehouseOut(&warehouseOut)
+	}
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -1100,7 +1126,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				}
 
 				good_id := int64(items["good_id"].(float64))
-				fmt.Println("stockout223232324343445456465656565565665", good_id)
+
 				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
 					utils.ErrorLog("good_type_id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1126,6 +1152,37 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				total := float64(count) * price
 				remark := items["remark"].(string)
 
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				dealer := int64(items["dealer"].(float64))
+				number := items["number"].(string)
+
+				expiry_date := items["expiry_date"].(string)
+
+				timeLayout := "2006-01-02"
+				loc, _ := time.LoadLocation("Local")
+				var expiryDate int64
+				if len(expiry_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					expiryDate = theTime.Unix()
+				}
+
+				product_date := items["product_date"].(string)
+
+				var productDate int64
+				if len(product_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					productDate = theTime.Unix()
+				}
+
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1139,8 +1196,11 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					Remark:                  remark,
 					OrgId:                   adminUserInfo.CurrentOrgId,
 					Type:                    types,
-					Manufacturer:            manufacturer_id,
-					Dealer:                  dealer_id,
+					Manufacturer:            manufacturer,
+					Number:                  number,
+					ExpiryDate:              expiryDate,
+					ProductDate:             productDate,
+					Dealer:                  dealer,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1162,25 +1222,39 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 		}
 	}
 
-	//查询库存
+	//出库逻辑
 	for _, item := range warehousingOutInfo {
-		parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count)
-		fmt.Println(parseDateErr)
-	}
+		//查询库存
+		warehouse, err := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+		fmt.Println("库存数量组吗", warehouse.Count)
+		if err != nil {
+			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":                "1",
+				"good_name":          goodObj.GoodName,
+				"specification_name": goodObj.SpecificationName,
+			})
+			return
+		} else {
+			parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count)
+			fmt.Println(parseDateErr)
+			if parseDateErr != nil {
+				utils.ErrorLog(parseDateErr.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":                "2",
+				"good_name":          "",
+				"specification_name": "",
+			})
+		}
 
-	errs := service.CreateWarehousingOutInfo(warehousingOutInfo)
-	info, _ := service.FindLastWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-		return
 	}
 
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":                   "出库成功",
-		"info":                  info,
-		"warehousing_out_order": warehousing_out_order,
-	})
+	//errs := service.CreateWarehousingOutInfo(warehousingOutInfo)
+	//info, _ := service.FindLastWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
 
 }
 func (c *StockManagerApiController) GetWarehouseOutList() {
@@ -1214,7 +1288,25 @@ func (c *StockManagerApiController) GetWarehouseOutList() {
 	}
 
 	adminUserInfo := c.GetAdminUserInfo()
-	warehouseOutList, total, err := service.FindAllWarehouseOutList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords)
+	var ids []int64
+	var goodids []int64
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetGoodInforByGoodName(keywords, adminUserInfo.CurrentOrgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+		}
+
+		if len(goodids) > 0 {
+			//出库详情但里面查询
+			info, _ := service.GetWarehoureOrderOutByGoodId(goodids, startTime, endTime, adminUserInfo.CurrentOrgId)
+			for _, it := range info {
+				ids = append(ids, it.WarehouseOutId)
+			}
+		}
+
+	}
+	warehouseOutList, total, err := service.FindAllWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids)
 	fmt.Println(err)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1277,10 +1369,9 @@ func (c *StockManagerApiController) GetWarehouseOutInfoList() {
 }
 func (c *StockManagerApiController) EditWarehouseOut() {
 	warehouse_out_time := c.GetString("warehouse_out_time")
+
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1304,8 +1395,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 		ID:               warehouseOut.ID,
 		Mtime:            mtime,
 		WarehouseOutTime: warehouseOutDate.Unix(),
-		Manufacturer:     manufacturer_id,
-		Dealer:           dealer_id,
 	}
 
 	service.EditWarehouseOut(tempWarehouseOut)
@@ -1366,6 +1455,37 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 				}
 				id := int64(items["id"].(float64))
 
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				dealer := int64(items["dealer"].(float64))
+
+				number := items["number"].(string)
+
+				timeLayout := "2006-01-02"
+				loc, _ := time.LoadLocation("Local")
+				expiry_date := items["expiry_date"].(string)
+				var expiryDate int64
+				if len(expiry_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					expiryDate = theTime.Unix()
+				}
+
+				product_date := items["product_date"].(string)
+
+				var productDate int64
+				if len(product_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", expiry_date+" 00:00:00", loc)
+					if err != nil {
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					productDate = theTime.Unix()
+				}
+
 				if id == 0 {
 					warehouseOutInfo := &models.WarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1380,10 +1500,13 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Type:                    types,
-						Manufacturer:            manufacturer_id,
-						Dealer:                  dealer_id,
 						IsSys:                   0,
 						SysRecordTime:           0,
+						Number:                  number,
+						ExpiryDate:              expiryDate,
+						ProductDate:             productDate,
+						Dealer:                  dealer,
+						Manufacturer:            manufacturer,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1417,10 +1540,13 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Mtime:                   time.Now().Unix(),
 						Type:                    types,
-						Manufacturer:            manufacturer_id,
-						Dealer:                  dealer_id,
+						Manufacturer:            manufacturer,
 						IsSys:                   is_sys,
 						SysRecordTime:           sys_record_time,
+						Number:                  number,
+						ExpiryDate:              expiryDate,
+						ProductDate:             productDate,
+						Dealer:                  dealer,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -3610,9 +3736,11 @@ func (this *StockManagerApiController) PostSearchGoodList() {
 	orgId := adminUserInfo.CurrentOrgId
 	list, _ := service.GetSearchGoodList(keyword, orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
 	})
 }
 
@@ -3669,6 +3797,7 @@ func (this *StockManagerApiController) GetStockListById() {
 	loc, _ := time.LoadLocation("Local")
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
+
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -3695,6 +3824,7 @@ func (this *StockManagerApiController) GetStockListById() {
 		"total":            total,
 		"manufacturerList": manufacturerList,
 	})
+
 }
 
 func (this *StockManagerApiController) GetStockOutList() {
@@ -3708,6 +3838,7 @@ func (this *StockManagerApiController) GetStockOutList() {
 	loc, _ := time.LoadLocation("Local")
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
+	is_sys, _ := this.GetInt64("is_sys")
 	var startTime int64
 	if len(start_time) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
@@ -3727,9 +3858,171 @@ func (this *StockManagerApiController) GetStockOutList() {
 		}
 		endTime = theTime.Unix()
 	}
-	outList, total, _ := service.GetStockOutList(id, orgId, limit, page, startTime, endTime)
+	outList, total, _ := service.GetStockOutList(id, orgId, limit, page, startTime, endTime, is_sys)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"outList": outList,
 		"total":   total,
 	})
 }
+
+func (this *StockManagerApiController) GetStockDrugCount() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println(orgId)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	count, _ := service.GetStockDrugCount(startTime, endTime, orgId)
+	outList, _ := service.GetAutoDiallysisBefor(startTime, endTime, orgId)
+	autoCount, _ := service.GetOutStockTotalCountFour(startTime, endTime, orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"count":     count,
+		"outList":   outList,
+		"autoCount": autoCount,
+	})
+}
+
+func (this *StockManagerApiController) GetOrderDetialByOrderId() {
+
+	//id, _ := this.GetInt64("id")
+	ids := this.GetString("id")
+	idsArray := strings.Split(ids, ",")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	order, _ := service.GetWarehouseOutOrder(idsArray, orgId)
+	list, _ := service.GetOrderDetialByOrderIdOne(idsArray, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+		"list":  list,
+	})
+}
+
+func (this *StockManagerApiController) GetOrderDetailById() {
+
+	good_id, _ := this.GetInt64("good_id")
+	record_time, _ := this.GetInt64("record_time")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	userDetails, err, total := service.FindUserDetailByIdOne(good_id, record_time, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  userDetails,
+			"total": total,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}
+
+func (this *StockManagerApiController) GetSingleOutOrderDetail() {
+	id, _ := this.GetInt64("id", 0)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	warehouseOutInfo, _ := service.GetOrderDetialByOrderId(id, orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	goodType, _ := service.GetAllGoodType(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             warehouseOutInfo,
+		"dealerList":       dealerList,
+		"manufacturerList": manufacturerList,
+		"goodType":         goodType,
+	})
+}
+
+func (this *StockManagerApiController) GetExprotStockList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	idArray := this.GetString("id")
+	ids := strings.Split(idArray, ",")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, _ := service.GetExprotStockList(orgId, ids, startTime, endTime)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *StockManagerApiController) GetOutExprotList() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	idArray := this.GetString("id")
+	ids := strings.Split(idArray, ",")
+	fmt.Println("ids2222222222", ids)
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	list, _ := service.GetOutExprotList(orgId, ids, startTime, endTime)
+	outCount, _ := service.GetOutStockTotalCountOne(startTime, endTime, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":  list,
+		"count": outCount,
+	})
+}

models/drug_stock.go

@@ -232,3 +232,8 @@ type VmDrugAutomaticReduceDetail struct {
 	DrugId                  int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Total                   int64
 }
+
+type VmDrugWarehouseInfo struct {
+	DrugId int64 `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count  int64 `gorm:"column:count" json:"count" form:"count"`
+}

models/good_models.go

@@ -22,61 +22,62 @@ func (GoodsType) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                          int64     `gorm:"column:id" json:"id" form:"id"`
-	GoodCode                    string    `gorm:"column:good_code" json:"good_code" form:"good_code"`
-	SpecificationName           string    `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId                  int64     `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	GoodUnit                    int64     `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	BuyPrice                    float64   `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	SellPrice                   float64   `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
-	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"`
-	Manufacturer                int64     `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                      int64     `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	ExpiryDateWarnDayCount      int64     `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
-	StockWarnCount              int64     `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
-	IsReuse                     int64     `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
-	Status                      int64     `gorm:"column:status" json:"status" form:"status"`
-	FilmArea                    string    `gorm:"column:film_area" json:"film_area" form:"film_area"`
-	IsUse                       int64     `gorm:"column:is_use" json:"is_use" form:"is_use"`
-	FilmMaterialQuality         string    `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
-	OrgId                       int64     `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier                    int64     `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Creater                     int64     `gorm:"column:creater" json:"creater" form:"creater"`
-	GoodName                    string    `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	Pinyin                      string    `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                        string    `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	GoodKind                    int64     `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
-	MedicalInsuranceLevel       int64     `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	RetailPrice                 float64   `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MedicalInsuranceNumber      string    `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	IsSpecialDiseases           int64     `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
-	IsRecord                    int64     `gorm:"column:is_record" json:"is_record" form:"is_record"`
-	StatisticsCategory          int64     `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	GoodStatus                  string    `gorm:"column:good_status" json:"good_status" form:"good_status"`
-	DefaultCount                int64     `gorm:"column:default_count" json:"default_count" form:"default_count"`
-	Sign                        int64     `gorm:"column:sign" json:"sign" form:"sign"`
-	IsDefault                   int64     `gorm:"column:is_default" json:"is_default" form:"is_default"`
-	IsChargeUse                 int64     `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
-	IsChargePredict             int64     `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
-	IsStatisticsWork            int64     `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
-	Sort                        int64     `gorm:"column:sort" json:"sort" form:"sort"`
-	IsDoctorUse                 int64     `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
-	Agent                       string    `gorm:"column:agent" json:"agent" form:"agent"`
-	GoodNumber                  string    `gorm:"column:good_number" json:"good_number" form:"good_number"`
-	GoodsType                   GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
-	CommdityCode                string    `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
-	SocialSecurityDirectoryCode string    `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
-	ProductionType              string    `gorm:"column:production_type" json:"production_type" form:"production_type"`
-	SpecialMedical              string    `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
-	IsMark                      int64     `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
-	MinNumber                   int64     `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	PackingUnit                 string    `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice                float64   `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	DefaultCountUnit            string    `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
-	MinUnit                     string    `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Total                       float64   `gorm:"column:total" json:"total" form:"total"`
+	ID                          int64                `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string               `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	SpecificationName           string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	GoodUnit                    int64                `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64              `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	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"`
+	Manufacturer                int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64                `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64                `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64                `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64                `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string               `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64                `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string               `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64                `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64                `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string               `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string               `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64                `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64                `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string               `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	IsSpecialDiseases           int64                `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
+	IsRecord                    int64                `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	StatisticsCategory          int64                `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
+	GoodStatus                  string               `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	DefaultCount                int64                `gorm:"column:default_count" json:"default_count" form:"default_count"`
+	Sign                        int64                `gorm:"column:sign" json:"sign" form:"sign"`
+	IsDefault                   int64                `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsChargeUse                 int64                `gorm:"column:is_charge_use" json:"is_charge_use" form:"is_charge_use"`
+	IsChargePredict             int64                `gorm:"column:is_charge_predict" json:"is_charge_predict" form:"is_charge_predict"`
+	IsStatisticsWork            int64                `gorm:"column:is_statistics_work" json:"is_statistics_work" form:"is_statistics_work"`
+	Sort                        int64                `gorm:"column:sort" json:"sort" form:"sort"`
+	IsDoctorUse                 int64                `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
+	Agent                       string               `gorm:"column:agent" json:"agent" form:"agent"`
+	GoodNumber                  string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	GoodsType                   GoodsType            `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
+	CommdityCode                string               `gorm:"column:commdity_code" json:"commdity_code" form:"commdity_code"`
+	SocialSecurityDirectoryCode string               `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	ProductionType              string               `gorm:"column:production_type" json:"production_type" form:"production_type"`
+	SpecialMedical              string               `gorm:"column:special_medical" json:"special_medical" form:"special_medical"`
+	IsMark                      int64                `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	MinNumber                   int64                `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingUnit                 string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	DefaultCountUnit            string               `gorm:"column:default_count_unit" json:"default_count_unit" form:"default_count_unit"`
+	MinUnit                     string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Total                       float64              `gorm:"column:total" json:"total" form:"total"`
+	StWarehousingInfo           []*StWarehousingInfo `gorm:"ForeignKey:good_id;AssociationForeignKey:ID" json:"xt_warehouse_info"`
 }
 
 func (GoodInfo) TableName() string {

models/self_drug_models.go

@@ -599,3 +599,38 @@ type StDrugWarehouseInfo struct {
 	PackingUnit      string  `json:"packing_unit"`
 	Dosage           int64   `json:"dosage"`
 }
+
+type VmDrugWarehouseOutInfo 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"`
+	DrugType                int64   `json:"drug_type"`
+	MaxUnit                 string  `json:"max_unit"`
+	MinUnit                 string  `json:"min_unit"`
+	MinNumber               int64   `json:"min_number"`
+	Dose                    float64 `json:"dose"`
+	DoseUnit                string  `json:"dose_unit"`
+	LastPrice               string  `json:"last_price"`
+	DrugName                string  `json:"drug_name"`
+}

models/stock_models.go

@@ -70,6 +70,39 @@ func (Warehousing) TableName() string {
 	return "xt_warehouse"
 }
 
+type StWarehousingInfo 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"`
+	Type              int64   `gorm:"column:type" json:"type"`
+	GoodName          string  `json:"good_name"`
+	PackingUnit       string  `json:"packing_unit"`
+	TotalCount        int64   `json:"total_count"`
+	SpecificationName string  `json:"specification_name"`
+}
+
+func (StWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}
+
 type WarehousingInfo struct {
 	ID               int64       `gorm:"column:id" json:"id"`
 	WarehousingId    int64       `gorm:"column:warehousing_id" json:"warehousing_id"`
@@ -95,6 +128,7 @@ type WarehousingInfo struct {
 	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"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -129,7 +163,8 @@ type VmWarehousingInfo struct {
 	GoodName          string      `gorm:"column:good_name" json:"good_name"`
 	SpecificationName string      `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
 	MinNumber         int64       `gorm:"column:min_number" json:"min_number" form:"min_number"`
-	MinUnit           string      `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	PackingUnit       string      `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	Count             int64       `gorm:json:"count"`
 }
 
 type WarehouseOut struct {
@@ -183,6 +218,7 @@ type WarehouseOutInfo struct {
 	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
 	SysRecordTime           int64        `gorm:"column:sys_record_time" json:"sys_record_time"`
 	PatientId               int64        `gorm:"column:patient_id" json:"patient_id"`
+	Number                  string       `gorm:"column:number" json:"number" form:"number"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -353,3 +389,78 @@ type VmWarehouseOutInfo struct {
 	Price  float64 `gorm:"column:price" json:"price"`
 	OrgId  int64   `gorm:"column:org_id" json:"org_id"`
 }
+
+type VmWarehouseInfo struct {
+	GoodId int64 `gorm:"column:good_id" json:"good_id"`
+	Count  int64 `gorm:"column:count" json:"count"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id"`
+}
+
+type WarehouseOutInfoOne struct {
+	ID                      int64   `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseInfotId        int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	GoodId                  int64   `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
+	Count                   int64   `gorm:"column:count" json:"count"`
+	Price                   float64 `gorm:"column:price" json:"price"`
+	TotalPrice              float64 `gorm:"column:total_price" json:"total_price"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id"`
+	Remark                  string  `gorm:"column:remark" json:"remark"`
+	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	Type                    int64   `gorm:"column:type" json:"type"`
+	Dealer                  int64   `gorm:"column:dealer" json:"dealer"`
+	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer"`
+	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys"`
+	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64   `gorm:"column:patient_id" json:"patient_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"`
+	MinNumber               int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingPrice            float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	PackingUnit             string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+}
+
+type WarehouseOutInfoTwo struct {
+	ID                      int64                `gorm:"column:id" json:"id"`
+	WarehouseOutId          int64                `gorm:"column:warehouse_out_id" json:"warehouse_out_id"`
+	WarehouseInfotId        int64                `gorm:"column:warehouse_info_id" json:"warehouse_info_id"`
+	GoodId                  int64                `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId              int64                `gorm:"column:good_type_id" json:"good_type_id"`
+	WarehousingOutTarget    int64                `gorm:"column:warehousing_out_target" json:"warehousing_out_target"`
+	Count                   int64                `gorm:"column:count" json:"count"`
+	Price                   float64              `gorm:"column:price" json:"price"`
+	TotalPrice              float64              `gorm:"column:total_price" json:"total_price"`
+	ProductDate             int64                `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate              int64                `gorm:"column:expiry_date" json:"expiry_date"`
+	Mtime                   int64                `gorm:"column:mtime" json:"mtime"`
+	Ctime                   int64                `gorm:"column:ctime" json:"ctime"`
+	Status                  int64                `gorm:"column:status" json:"status"`
+	OrgId                   int64                `gorm:"column:org_id" json:"org_id"`
+	Remark                  string               `gorm:"column:remark" json:"remark"`
+	IsCancel                int64                `gorm:"column:is_cancel" json:"is_cancel"`
+	WarehouseOutOrderNumber string               `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number"`
+	Type                    int64                `gorm:"column:type" json:"type"`
+	Dealer                  int64                `gorm:"column:dealer" json:"dealer"`
+	Manufacturer            int64                `gorm:"column:manufacturer" json:"manufacturer"`
+	IsSys                   int64                `gorm:"column:is_sys" json:"is_sys"`
+	SysRecordTime           int64                `gorm:"column:sys_record_time" json:"sys_record_time"`
+	PatientId               int64                `gorm:"column:patient_id" json:"patient_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"`
+	MinNumber               int64                `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	PackingPrice            float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	MinUnit                 string               `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Number                  string               `gorm:"column:number" json:"number" form:"number"`
+	PackingUnit             string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	StWarehousingInfo       []*StWarehousingInfo `gorm:"ForeignKey:good_id;AssociationForeignKey:GoodId" json:"xt_warehouse_info"`
+}

models/stock_query_models.go

@@ -1,13 +1,13 @@
 package models
 
 type StockInfo struct {
-	ID                int64  `gorm:"column:id" json:"id"`
-	GoodCode          string `gorm:"column:good_code" json:"good_code"`
-	GoodName          string `gorm:"column:good_name" json:"good_name"`
-	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
-	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id"`
-	GoodUnit          int64  `gorm:"column:good_unit" json:"good_unit"`
-
+	ID                    int64                   `gorm:"column:id" json:"id"`
+	GoodCode              string                  `gorm:"column:good_code" json:"good_code"`
+	GoodName              string                  `gorm:"column:good_name" json:"good_name"`
+	SpecificationName     string                  `gorm:"column:specification_name" json:"specification_name"`
+	GoodTypeId            int64                   `gorm:"column:good_type_id" json:"good_type_id"`
+	GoodUnit              int64                   `gorm:"column:good_unit" json:"good_unit"`
+	MinUnit               string                  `gorm:"column:min_unit" json:"min_unit"`
 	QueryWarehousingInfo  []QueryWarehousingInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehousing_info"`
 	QuerySalesReturnInfo  []QuerySalesReturnInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_sales_return_info"`
 	QueryWarehouseOutInfo []QueryWarehouseOutInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehouseout_info"`

service/app_version.go

@@ -266,8 +266,3 @@ func GetLastHisOrder() (his models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("user_org_id = 4 AND status = 1 AND order_status = 2").Last(&his).Error
 	return
 }
-
-func SaveOrder(his *models.HisOrder) {
-	writeDb.Save(&his)
-
-}

service/gobal_config_service.go

@@ -497,20 +497,12 @@ func GetDrugWarehuseOrderInfo(orgid int64) (drug []*models.DrugWarehouseInfo, er
 }
 
 func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int64, startime int64, endtime int64, orgid int64) (list []*models.StDrugWarehouseInfo, total int64, err error) {
-
+	offset := (page - 1) * limit
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
 
 	likeKey := "%" + keyword + "%"
-	offset := (page - 1) * limit
-	if len(keyword) > 0 {
-		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_name like ?", orgid, likeKey)
-	} else {
-		db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ?", orgid)
-	}
-	if drugcategory > 0 {
-		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_category = ?", orgid, drugcategory)
-	} else {
-		db = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status= 1 and t.org_id = ? and  t.drug_category = ?", orgid, drugcategory)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
 	}
 
 	if startime > 0 {
@@ -519,12 +511,29 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 	if endtime > 0 {
 		db = db.Where("x.ctime<=?", endtime)
 	}
+	if drugcategory > 0 && len(keyword) == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id =?", orgid).Where("t.drug_type = ?", drugcategory).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
+	}
+	if drugcategory <= 0 && len(keyword) == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
+	}
 
-	if orgid > 0 {
-		db = db.Where("x.org_id = ?", orgid)
+	if len(keyword) > 0 && drugcategory == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id=?", orgid).Where("t.drug_name like ?", likeKey).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
+	}
+	if len(keyword) <= 0 && drugcategory == 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
+	}
+
+	if len(keyword) > 0 && drugcategory > 0 {
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ?", orgid).Where("t.drug_type = ? or t.drug_name like ?", drugcategory, likeKey).Group("x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+		return
 	}
 
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Offset(offset).Count(&total).Group("x.drug_id").Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
@@ -547,7 +556,7 @@ func GetDrugStockFlow(drugid int64, startime int64, endtime int64, page int64, l
 		db = db.Where("x.drug_id = ?", drugid)
 	}
 
-	err = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status = 1 and t.org_id = ?", orgid).Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
+	err = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status = 1 and t.org_id = ?", orgid).Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,x.ctime,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
@@ -573,14 +582,107 @@ func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64
 		db = db.Where("x.is_sys = 0")
 	}
 	if stocktype == 2 {
-		db = db.Where("x,is_sys = 1")
+		db = db.Where("x.is_sys = 1")
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id,x.ctime").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
 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 = ?", drugid, orgid).Offset(offset).Count(&total).Find(&drug).Error
+	err = XTReadDB().Model(&drug).Where("drug_id = ? and org_id = ?", drugid, orgid).Count(&total).Offset(offset).Limit(limit).Find(&drug).Error
 	return drug, total, err
 }
+
+func GetDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("sum(x.warehousing_count) as count,x.drug_id").Group("x.drug_id").Scan(&info).Error
+	return info, err
+}
+
+func GetMinCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("sum(x.stock_min_number) as count,x.drug_id").Group("x.drug_id").Scan(&info).Error
+	return info, err
+}
+
+func GetOutDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseInfo, err error) {
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("sum(x.count) as count,x.drug_id").Group("x.drug_id").Scan(&info).Error
+	return info, err
+}
+
+func GetAutoDrugCountList(startime int64, endtime int64, orgid int64) (info []*models.DrugAutomaticReduceDetail, err error) {
+	db := XTReadDB().Table("xt_drug_automatic_reduce_detail as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.record_time >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.record_time<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("sum(x.count) as count,x.drug_id").Group("x.drug_id").Scan(&info).Error
+	return info, err
+
+}
+
+func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if id > 0 {
+		db = db.Where("x.warehouse_out_id = ?", id)
+	}
+
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	return info, err
+}
+
+func FindDrugStockUserDetailByIdThree(id int64, record_time int64, org_id int64) (user []*DrugAutomaticReduceDetail, err error, total int64) {
+
+	db := readDb.Model(&user)
+	db = db.Preload("Drug", "org_id = ? AND status = 1", org_id)
+	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Where("status = 1 AND org_id = ? AND drug_id = ? AND record_time =?", org_id, id, record_time)
+	db = db.Count(&total)
+	err = db.Find(&user).Error
+	return user, err, total
+}

service/his_project_service.go

@@ -398,7 +398,9 @@ func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatien
 
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64) (prescription []*models.HisPrescription, err error) {
 
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1 and user_org_id = ?", orgid).Preload("Drug", "status = 1")
+	}).Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", orgid).Preload("HisProject").Preload("GoodInfo", "status=1")
 	}).Preload("VMHisPrescriptionInfo", "status =1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
 

service/mobile_dialysis_service.go

@@ -894,15 +894,15 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 		if patientType == 0 {
 			db := readDb.
 				Table("xt_schedule").
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
 				}).
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
-				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -912,16 +912,15 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 		if patientType > 0 {
 			db := readDb.
 				Table("xt_schedule").
-				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-				}).
-				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
-				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, deliverWay, adminUserId, adminUserId).
 				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Where("status = 1 AND user_org_id = ?", orgID)
+				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+				}).Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
 			}
@@ -932,15 +931,15 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 		if patientType == 0 {
 			db := readDb.
 				Table("xt_schedule").
-				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 					return db.Where("status = 1 AND user_org_id = ? and dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
 				}).
 				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? ", orgID, scheduleDate).
-				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -950,15 +949,14 @@ func GetHisDoctorAdvices(orgID int64, scheduleDate int64, deliverWay string, pat
 		if patientType > 0 {
 			db := readDb.
 				Table("xt_schedule").
+				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
 				Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
 					return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-				}).
-				Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+				}).Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 				Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
-				Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
-				Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
-				Preload("HisPrescriptionProject", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 				Where("status = 1 AND user_org_id = ?", orgID)
 			if scheduleDate != 0 {
 				db = db.Where("schedule_date = ?", scheduleDate)
@@ -1523,6 +1521,11 @@ func FindConsumablesByDateTwo(orgID int64, patient_id int64, recordDate int64) (
 	return
 }
 
+func FindConsumablesByDateThree(orgID int64, patient_id int64, recordDate int64) (consumables []*models.BloodAutomaticReduceDetail, err error) {
+	err = readDb.Model(&models.BloodAutomaticReduceDetail{}).Where("user_org_id = ? AND patient_id = ? AND record_time = ? AND status = 1 AND count > 0", orgID, patient_id, recordDate).Find(&consumables).Error
+	return
+}
+
 //func FindLastConsumables(orgID int64, patient_id int64, recordDate int64) (consumables []*models.DialysisBeforePrepare, err error){
 //	err = readDb.Model(&models.DialysisBeforePrepare{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND status = 1", orgID, patient_id,recordDate).Find(&consumables).Error
 //	return
@@ -1833,7 +1836,7 @@ type HisMScheduleDoctorAdviceVM struct {
 	ScheduleType           int64                            `gorm:"column:schedule_type" json:"schedule_type"`
 	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
 	Status                 int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKeyPatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
 	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
 	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
 	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
@@ -2037,13 +2040,13 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 			db = db.Where("partition_id = ?", partitionType)
 		}
 		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and delivery_way = ?", orgID, scheduleDate, deliverWay).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
 			Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
 			db = db.Where("schedule_date = ?", scheduleDate)
@@ -2058,13 +2061,13 @@ func GetHisDoctorAdvicesOne(orgID int64, scheduleDate int64, deliverWay string,
 			db = db.Where("partition_id = ?", partitionType)
 		}
 		db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
-			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
-			}).
 			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ?", orgID, scheduleDate).
+			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ?", orgID).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+			}).
 			Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
 			db = db.Where("schedule_date = ?", scheduleDate)
@@ -2140,6 +2143,12 @@ func DeleteAutoReduceDetail(good_id int64, record_time int64, patient_id int64)
 	return err
 }
 
+func DeleteDialysisBeforOne(good_id int64, record_time int64, patient_id int64) error {
+	detail := models.DialysisBeforePrepare{}
+	err := XTWriteDB().Model(&detail).Where("good_id = ? and status = 1 and record_date = ? and patient_id = ?", good_id, record_time, patient_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func BatchAdviceCheck(ids []string, creator int64) error {
 
 	advice := models.XtDoctorAdvice{}
@@ -2237,3 +2246,18 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 
 	return vms, err
 }
+
+func UpdateStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
+
+	prepare := models.DialysisBeforePrepare{}
+
+	err := XTWriteDB().Model(&prepare).Where("good_id= ? and record_date = ? and patient_id = ? and count  <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
+	return err
+}
+
+func UPdateAutoStockGoods(good_id int64, record_time int64, patient_id int64, count int64) error {
+
+	detail := models.AutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("good_id = ? and record_time = ? and patient_id = ? and count <> 0 and status = 1", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
+	return err
+}

service/stock_service.go

@@ -375,11 +375,11 @@ func CreateWarehousingInfo(warehousingInfo []*models.WarehousingInfo) (err error
 	if len(warehousingInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehousingInfo) > 0 {
-			thisSQL := "INSERT INTO xt_warehouse_info (warehousing_id, good_id, good_type_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,stock_count) VALUES "
+			thisSQL := "INSERT INTO xt_warehouse_info (warehousing_id, good_id, good_type_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,stock_count,license_number) 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.GoodId)
 				insertData = append(insertData, info.GoodTypeId)
@@ -399,7 +399,7 @@ func CreateWarehousingInfo(warehousingInfo []*models.WarehousingInfo) (err error
 				insertData = append(insertData, info.WarehousingOrder)
 				insertData = append(insertData, info.Type)
 				insertData = append(insertData, info.WarehousingCount)
-
+				insertData = append(insertData, info.LicenseNumber)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -475,6 +475,18 @@ func FindFirstWarehousingInfoByStock(good_id int64, good_type_id int64) (info mo
 	return info, err
 }
 
+func FindFirstWarehousingInfoByStockTwo(good_id int64, good_type_id int64) (info models.VmWarehousingInfo, err error) {
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	if good_id > 0 {
+		db = db.Where("x.good_id = ?", good_id)
+	}
+	if good_type_id > 0 {
+		db = db.Where("x.good_type_id = ?", good_type_id)
+	}
+	err = db.Select("sum(x.stock_count) as count").Scan(&info).Error
+	return info, err
+}
+
 //药品先进先出,找出最先入库的批次
 
 func FindLastDrugWarehousingInfoByID(drug_id int64) (info models.XtDrugWarehouseInfo, err error) {
@@ -502,15 +514,16 @@ func FindLastDrugWarehousingInfo(order string) (info models.DrugWarehouseInfo, e
 
 }
 
-func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (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) (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)
 
 	if len(keywords) > 0 {
 		likeKey := "%" + keywords + "%"
+
 		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_warehouse.creater")
-		db = db.Joins("join xt_manufacturer on xt_manufacturer.id = xt_warehouse.manufacturer")
-		db = db.Where("xt_manufacturer.manufacturer_name LIKE ? OR sgj_user_admin_role.user_name LIKE ? OR xt_warehouse.warehousing_order LIKE ?", likeKey, likeKey, likeKey).Group("xt_warehouse.id")
+
+		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse.warehousing_order LIKE ? or xt_warehouse.id in(?)", likeKey, likeKey, ids).Group("xt_warehouse.id")
 	}
 
 	if startTime > 0 {
@@ -519,12 +532,66 @@ func FindAllWarehousingList(orgId int64, page int64, limit int64, startTime int6
 	if endTime > 0 {
 		db = db.Where("xt_warehouse.operation_time<= ?", endTime)
 	}
+
 	db = db.Count(&total)
 	offset := (page - 1) * limit
 	err = db.Offset(offset).Limit(limit).Order("xt_warehouse.ctime desc").Find(&list).Error
 	return
 }
 
+func GetGoodInforByGoodName(keyword string, orgid int64) (goodInfo []*models.GoodInfo, err error) {
+
+	db := XTReadDB().Model(&goodInfo).Where("status = 1")
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("good_name like ?", likeKey)
+	}
+	err = db.Find(&goodInfo).Error
+	return goodInfo, err
+
+}
+
+func GetWarehoureOrderInfoByGoodId(good_id []int64, startime int64, endtime int64, orgid int64) (info []*models.WarehousingInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status =1")
+	if len(good_id) > 0 {
+		db = db.Where("good_id in (?)", good_id)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}
+
+func GetWarehoureOrderOutByGoodId(good_id []int64, startime int64, endtime int64, orgid int64) (info []*models.WarehouseOutInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status =1")
+	if len(good_id) > 0 {
+		db = db.Where("good_id in (?)", good_id)
+	}
+	if startime > 0 {
+		db = db.Where("ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("org_id = ?", orgid)
+	}
+	err = db.Find(&info).Error
+	return info, err
+}
+
 type VMDrugWarehouse struct {
 	ID               int64                `gorm:"column:id" json:"id" form:"id"`
 	WarehousingOrder string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
@@ -630,7 +697,11 @@ func FindAllDrugWarehousingList(orgId int64, page int64, limit int64, startTime
 func FindWarehousingInfoById(id int64) (list []*models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? AND status = 1", id).Preload("GoodInfo").Find(&list).Error
 	return list, err
+}
 
+func FindWarehousingInfoByIdOne(id []int64) (list []*models.WarehousingInfo, err error) {
+	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_id in(?) AND status = 1", id).Preload("GoodInfo").Find(&list).Error
+	return list, err
 }
 
 func FindDrugWarehousingInfoById(id int64, org_id int64) (list []*VMDrugWarehouseInfo, err error) {
@@ -638,18 +709,54 @@ func FindDrugWarehousingInfoById(id int64, org_id int64) (list []*VMDrugWarehous
 	return list, err
 }
 
+func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.StDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if len(id) > 0 {
+		db = db.Where("x.warehousing_id in(?)", id)
+	}
+	if org_id > 0 {
+		db = db.Where("x.org_id = ?", org_id)
+	}
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,t.manufacturer,t.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
+	return list, err
+}
+
 func FindWarehousingById(id int64) (warehousing models.Warehousing, err error) {
 	err = readDb.Model(&models.Warehousing{}).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
 	return warehousing, err
 
 }
 
+func FindWarehousingByIdOne(id []string) (warehousing []*models.Warehousing, err error) {
+	err = readDb.Model(&models.Warehousing{}).Where("id in(?) and status = 1", id).Find(&warehousing).Error
+	//err = readDb.Model(&models.Warehousing{}).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
+	return warehousing, err
+
+}
+
 func FindDrugWarehousingById(id int64, org_id int64) (warehousing VMDrugWarehouse, err error) {
 	err = readDb.Model(&VMDrugWarehouse{}).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
 	return warehousing, err
 
 }
 
+func FindDrugWarehousingByIdOne(id []string, org_id int64) (warehousing []*models.DrugWarehouse, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse as x").Where("x.status = 1")
+	if len(id) > 0 {
+		db = db.Where("x.id in(?)", id)
+	}
+	if org_id > 0 {
+		db = db.Where("x.org_id = ?", org_id)
+	}
+
+	err = db.Select("x.id,x.warehousing_order,x.operation_time,x.org_id,x.creater,x.ctime,x.modifier,x.warehousing_time").Find(&warehousing).Error
+	return warehousing, err
+}
+
 //func FindDrugWarehousingById(id int64) (warehousing models.DrugWarehouse, err error) {
 //	err = readDb.Model(&models.DrugWarehouse{}).Where("id = ? AND status = 1 ", id).First(&warehousing).Error
 //	return warehousing, err
@@ -891,11 +998,11 @@ func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err
 	if len(warehouseOutInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehouseOutInfo) > 0 {
-			thisSQL := "INSERT INTO xt_warehouse_out_info (warehouse_out_id, good_id, good_type_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer) VALUES "
+			thisSQL := "INSERT INTO xt_warehouse_out_info (warehouse_out_id, good_id, good_type_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,number) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehouseOutInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehouseOutId)
 				insertData = append(insertData, info.GoodId)
 				insertData = append(insertData, info.GoodTypeId)
@@ -912,7 +1019,7 @@ func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err
 				insertData = append(insertData, info.Type)
 				insertData = append(insertData, info.Dealer)
 				insertData = append(insertData, info.Manufacturer)
-
+				insertData = append(insertData, info.Number)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -1006,6 +1113,29 @@ func FindAllWarehouseOutList(orgId int64, page int64, limit int64, startTime int
 
 }
 
+func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []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)
+
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_warehouse_out.creater")
+		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_warehouse_out.warehouse_out_order_number LIKE ? or xt_warehouse_out.id in(?)", likeKey, likeKey, ids).Group("xt_warehouse_out.id")
+	}
+
+	if startTime > 0 {
+		db = db.Where("xt_warehouse_out.ctime >=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("xt_warehouse_out.ctime<= ?", endTime)
+	}
+	db = db.Count(&total)
+	offset := (page - 1) * limit
+	err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.ctime desc").Find(&list).Error
+	return list, total, err
+
+}
+
 func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (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)
@@ -1644,7 +1774,13 @@ func UpDateDrugWarehouseInfoByStock(info *models.XtDrugWarehouseInfo) (err error
 }
 
 func UpDateWarehouseInfoByStock(info *models.WarehousingInfo) (err error) {
-	err = writeDb.Save(&info).Error
+	ut := writeDb.Begin()
+	err = ut.Save(&info).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
 	return err
 }
 
@@ -2150,9 +2286,14 @@ func AddSigleDrugWarehouseOutInfo(info *models.DrugWarehouseOutInfo) error {
 }
 
 func AddSigleAutoReduceRecordInfo(detail *models.AutomaticReduceDetail) error {
-	err := writeDb.Create(&detail).Error
+	ut := writeDb.Begin()
+	err := ut.Create(&detail).Error
+	if err != nil {
+		ut.Rollback()
+		return err
+	}
+	ut.Commit()
 	return err
-
 }
 
 func AddSigleDrugAutoReduceRecordInfo(detail *models.DrugAutomaticReduceDetail) error {
@@ -2677,7 +2818,9 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 	db := XTReadDB().Model(&good).Where("org_id =? and status = 1", orgid)
 	if len(keywords) > 0 {
 		likekey := "%" + keywords + "%"
-		err = db.Where("(good_name Like ?)", likekey).Find(&good).Error
+		err = db.Where("(good_name Like ?)", likekey).Preload("StWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+			return XTReadDB().Where("org_id=? and status = 1 and warehousing_count <> 0", orgid)
+		}).Find(&good).Error
 	} else {
 		err = db.Find(&good).Error
 	}
@@ -2685,8 +2828,13 @@ func GetSearchGoodList(keywords string, orgid int64) (good []*models.GoodInfo, e
 }
 
 func CreateAutoReduceRecord(detail *models.BloodAutomaticReduceDetail) error {
-
-	err := writeDb.Create(&detail).Error
+	db := writeDb.Begin()
+	err := db.Create(&detail).Error
+	if err != nil {
+		db.Rollback()
+		return err
+	}
+	db.Commit()
 	return err
 }
 
@@ -2694,7 +2842,7 @@ func GetAutoMaticReduceDetail(orgid int64, patient_id int64, recordtime int64, g
 
 	var autoreduece models.BloodAutomaticReduceDetail
 	var err error
-	err = XTReadDB().Model(&autoreduece).Where("org_id = ? and patient_id = ?  and status = 1 and record_time = ? and good_id = ? and good_type_id = ?", orgid, patient_id, recordtime, goodid, goodtypeid).Find(&autoreduece).Error
+	err = XTReadDB().Model(&autoreduece).Where("org_id = ? and patient_id = ?  and status = 1 and record_time = ? and good_id = ? and good_type_id = ? and count<> 0", orgid, patient_id, recordtime, goodid, goodtypeid).Find(&autoreduece).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
 	}
@@ -2759,7 +2907,7 @@ func GetAllStockList(page int64, limit int64, startime int64, endtime int64, goo
 	if good_type > 0 {
 		db = db.Where("t.good_type_id = ?", good_type)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.manufacturer").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Count(&total).Group("x.good_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.manufacturer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&info).Error
 	return info, total, err
 }
 
@@ -2782,12 +2930,12 @@ func GetStockListById(good_id int64, orgid int64, limit int64, page int64, start
 	if good_id > 0 {
 		db = db.Where("x.good_id = ?", good_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Offset(offset).Count(&total).Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&info).Error
 	return info, total, err
 
 }
 
-func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, startime int64, endtime int64) (info []*models.WarehouseOutInfo, total int64, err error) {
+func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, startime int64, endtime int64, is_sys int64) (info []*models.WarehouseOutInfo, total int64, err error) {
 	offset := (page - 1) * limit
 
 	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status= 1")
@@ -2804,6 +2952,221 @@ func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, starti
 	if good_id > 0 {
 		db = db.Where("x.good_id = ?", good_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id").Offset(offset).Count(&total).Scan(&info).Error
+	if is_sys == 2 {
+		db = db.Where("x.is_sys = 1")
+	}
+	if is_sys == 3 {
+		db = db.Where("x.is_sys = 0")
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.is_sys").Offset(offset).Count(&total).Scan(&info).Error
 	return info, total, err
 }
+
+func GetStockDrugCount(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Select("sum(x.warehousing_count) as count,x.good_id").Group("x.good_id").Scan(&info).Error
+	return info, err
+}
+
+func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*models.VmWarehouseInfo, err error) {
+	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Select("sum(x.count) as count,x.good_id").Where("is_sys = 0").Group("x.good_id").Scan(&info).Error
+	return info, err
+}
+
+func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
+
+	if startime > 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime).Scan(&autoMatic).Error
+	} else {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
+	}
+
+	if endtime > 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, endtime).Scan(&autoMatic).Error
+	} else {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
+	}
+
+	return autoMatic, err
+
+}
+
+func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutInfoOne, err error) {
+
+	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)
+	if id > 0 {
+		db = db.Where("x.warehouse_out_id = ?", id)
+	}
+	if orgid > 0 {
+		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,x.is_sys,x.sys_record_time,x.number,x.remark,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	return out, err
+}
+
+func GetWarehouseOutOrder(id []string, orgid int64) (out []*models.WarehouseOut, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_out as x").Where("x.status = 1")
+	if len(id) > 0 {
+		db = db.Where("x.id in(?)", id)
+	}
+	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
+	return out, err
+}
+
+func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.WarehouseOutInfoOne, err error) {
+
+	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)
+	if len(id) > 0 {
+		db = db.Where("x.warehouse_out_id in (?)", id)
+	}
+	if orgid > 0 {
+		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,x.is_sys,x.sys_record_time,x.number,x.remark,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	return out, err
+}
+
+func FindUserDetailByIdOne(good_id int64, record_time int64, org_id int64) (user []*models.AutomaticReduceDetail, err error, total int64) {
+	db := readDb.Model(&models.AutomaticReduceDetail{})
+	db = db.Preload("GoodInfo", "org_id = ? AND status = 1", org_id)
+	db = db.Preload("GoodsType", "status = 1")
+	db = db.Preload("Patients", "user_org_id = ? AND status = 1", org_id)
+	db = db.Where("status = 1 AND org_id = ? AND good_id = ? AND record_time = ? ", org_id, good_id, record_time)
+	db = db.Count(&total)
+	err = db.Find(&user).Error
+	return
+}
+
+func GetGoodInformationByGoodId(good_id int64) (models.GoodInfo, error) {
+
+	info := models.GoodInfo{}
+	err := XTReadDB().Where("id = ? and status = 1", good_id).Find(&info).Error
+	return info, err
+}
+
+func GetExprotStockList(orgid int64, orderid []string, startime int64, endtime int64) (info []*models.StWarehousingInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+
+	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+	fmt.Println(table)
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if len(orderid) > 0 {
+		db = db.Where("x.warehousing_id in(?)", orderid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,Sum(x.warehousing_count)as total_count,x.price,x.dealer,x.manufacturer,x.remark,t.good_name,t.packing_unit,t.specification_name,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&info).Error
+
+	return info, err
+}
+
+func GetDrugWarehouOrderInfo(startime int64, endtime int64, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Select("x.drug_id,x.count,x.count_unit,t.max_unit,t.min_unit,t.min_number").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&info).Error
+	return info, err
+}
+
+func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64) (out []*models.WarehouseOutInfoOne, err error) {
+
+	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)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	if len(ids) > 0 {
+		db = db.Where("x.warehouse_out_id in (?)", ids)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,Sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	return out, err
+
+}
+
+func FindeDrugWarehouseOutOrder(ids []string, orgid int64) (info []*models.DrugWarehouseOut, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out as x").Where("x.status = 1")
+	if len(ids) > 0 {
+		db = db.Where("x.id in(?)", ids)
+	}
+	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.is_sys").Scan(&info).Error
+	return info, err
+
+}
+
+func FindeDrugWarehouseOutDetail(ids []string, orgid int64) (info []*models.VmDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1 ")
+	table := XTReadDB().Table("x.base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if len(ids) > 0 {
+		db = db.Where("x.warehouse_out_id in(?)", ids)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.product_date,x.expiry_date,x.number,x.batch_number,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.drug_name").Joins("left join xt_base_drug as t on t.id =x.drug_id").Scan(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -16,7 +16,7 @@ import (
 
 // 药品出库
 
-func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
+func DrugsDelivery(orgID int64, creater int64, advice *models.DoctorAdvice) (err error) {
 	// 1.判断药品是否来自专用字典的药品库
 	// 2.判断当天当前机构有没有创建出库单，没有则创建
 	// 3.创建出库流程
@@ -45,7 +45,7 @@ func DrugsDelivery(orgID int64, advice *models.DoctorAdvice) (err error) {
 				WarehouseOutOrderNumber: warehousing_out_order,
 				OperationTime:           time.Now().Unix(),
 				OrgId:                   orgID,
-				Creater:                 0,
+				Creater:                 creater,
 				Ctime:                   time.Now().Unix(),
 				Status:                  1,
 				WarehouseOutTime:        record_time,
@@ -258,7 +258,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 
 // 药品出库
 
-func HisDrugsDelivery(orgID int64, advice *models.HisDoctorAdviceInfo) (err error) {
+func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdviceInfo) (err error) {
 	// 1.判断药品是否来自专用字典的药品库
 	// 2.判断当天当前机构有没有创建出库单，没有则创建
 	// 3.创建出库流程
@@ -284,7 +284,7 @@ func HisDrugsDelivery(orgID int64, advice *models.HisDoctorAdviceInfo) (err erro
 				WarehouseOutOrderNumber: warehousing_out_order,
 				OperationTime:           time.Now().Unix(),
 				OrgId:                   orgID,
-				Creater:                 0,
+				Creater:                 creater,
 				Ctime:                   time.Now().Unix(),
 				Status:                  1,
 				WarehouseOutTime:        record_time,
@@ -350,7 +350,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	// 将该批次的剩余库存数量转换为拆零数量
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-
+	fmt.Println("拆零数量2222222222222222222", stock_number)
+	fmt.Println("出库数量55555555555555555555", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -369,7 +370,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 		}
 
 		warehouseOutInfo.Count = deliver_number
-		warehouseOutInfo.CountUnit = drup.MinUnit
+		warehouseOutInfo.CountUnit = advice.PrescribingNumberUnit
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 
@@ -388,7 +389,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 				OrgId:                   orgID,
 				DrugId:                  advice.DrugId,
 				Count:                   deliver_number,
-				CountUnit:               drup.MinUnit,
+				CountUnit:               advice.PrescribingNumberUnit,
 			}
 			errTwo := AddSigleDrugAutoReduceRecordInfo(details)
 			if errTwo != nil {
@@ -633,12 +634,6 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 
 	//查询该患者当天已经出库的耗材信息
 	goods_yc, _ := FindConsumablesByDateTwo(orgID, patient_id, record_time)
-	for _, item := range goods_yc {
-		fmt.Println("item0000000000000", item.Count)
-	}
-	for _, item := range goods {
-		fmt.Println("item1111111111111", item.Count)
-	}
 	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
 	for i := len(goods_yc) - 1; i >= 0; i-- {
 		goods_yc_temp := goods_yc[i]
@@ -652,25 +647,21 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 					goods = append(goods[:j], goods[j+1:]...)
 					break
 				}
-				fmt.Println("998888888888888", goods_yc_temp.Count)
-				fmt.Println("7777777777777777", goods_temp.Count)
 				// 如果已经出库的数量 大于 新请求出库的数量，则代表需要删除出库
 				if goods_yc_temp.Count > goods_temp.Count {
-					fmt.Println("进来了是吗")
+
 					temp_count := goods_yc_temp.Count - goods_temp.Count
 					goods_yc[i].Count = temp_count
 					goods = append(goods[:j], goods[j+1:]...)
 					break
 				}
-				fmt.Println("555555555555", goods_yc_temp.Count)
-				fmt.Println("444444444444", goods_temp.Count)
 				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
 				if goods_yc_temp.Count < goods_temp.Count {
 					temp_count := goods_temp.Count - goods_yc_temp.Count
-					fmt.Println("988888888888888", temp_count)
+					//fmt.Println("988888888888888", temp_count)
 					goods[j].Count = temp_count
 					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
-					fmt.Println("888888888", goods_yc)
+					//fmt.Println("888888888", goods_yc)
 					break
 				}
 			}
@@ -678,7 +669,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 	}
 
 	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
-	// goods 这个数据就是需要出库的耗材的数据
+	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
 	fmt.Println("goods222222222222", goods)
 	fmt.Println("goodsy999999999999", goods_yc)
 	if len(goods) > 0 {
@@ -718,7 +709,7 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 		for _, item := range goods {
 			var newCount int64 = 0
 			for _, it := range goodOne {
-				if item.GoodTypeId == it.GoodTypeId && it.GoodId == it.GoodId {
+				if item.GoodTypeId == it.GoodTypeId && item.GoodId == it.GoodId {
 					newCount = it.Count
 				}
 			}
@@ -731,16 +722,6 @@ func ConsumablesDeliveryTotal(orgID int64, patient_id int64, record_time int64,
 			ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
 		}
 
-		// for _, item := range goodOne {
-		// 	prepare := models.DialysisBeforePrepare{
-		// 		GoodTypeId: item.GoodTypeId,
-		// 		GoodId:     item.GoodId,
-		// 		Count:      item.Count,
-		// 		NewCount:   item.NewCount,
-		// 	}
-		// 	fmt.Println("数量99999999999999999", item.Count)
-		// 	ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, item.Count)
-		// }
 	}
 
 	if len(goods_yc) > 0 {
@@ -797,61 +778,10 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		warehouseOutInfo.Count = count
 		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
-
-		//判断当前耗材是否有出库详情记录
-		_, errcode := GetStockInRecoredByGoodId(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID)
-		if errcode == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
-			if errOne != nil {
-				return errOne
-			} else {
-
-				details := models.BloodAutomaticReduceDetail{
-					WarehouseOutId:          warehouseOutInfo.ID,
-					WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-					PatientId:               patient_id,
-					Ctime:                   time.Now().Unix(),
-					Mtime:                   time.Now().Unix(),
-					Status:                  1,
-					RecordTime:              record_time,
-					OrgId:                   orgID,
-					GoodId:                  goods.GoodId,
-					GoodTypeId:              goods.GoodTypeId,
-					Count:                   count,
-				}
-				//查询当天耗材是否已经存在数据
-				_, errcode := GetAutoMaticReduceDetail(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-				if errcode == gorm.ErrRecordNotFound {
-					errTwo := CreateAutoReduceRecord(&details)
-					if errTwo != nil {
-						return errTwo
-					}
-				} else if errcode == nil {
-					DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-					CreateAutoReduceRecord(&details)
-				}
-			}
-		} else if errcode == nil {
-			warehouseOutInfo := &models.WarehouseOutInfo{
-				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseOut.ID,
-				WarehouseInfotId:        warehouse.ID,
-				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Remark:                  "",
-				OrgId:                   orgID,
-				Type:                    1,
-				Manufacturer:            0,
-				Dealer:                  0,
-				IsSys:                   1,
-				SysRecordTime:           record_time,
-				GoodTypeId:              goods.GoodTypeId,
-				GoodId:                  goods.GoodId,
-				PatientId:               patient_id,
-			}
-			warehouseOutInfo.Count = count
-			//更新入库详情表
-			UpdateAutoMaticReduceDetail(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
+		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		} else {
 			details := models.BloodAutomaticReduceDetail{
 				WarehouseOutId:          warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
@@ -867,6 +797,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			}
 			//查询当天耗材是否已经存在数据
 			_, errcode := GetAutoMaticReduceDetail(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
+
 			if errcode == gorm.ErrRecordNotFound {
 				errTwo := CreateAutoReduceRecord(&details)
 				if errTwo != nil {
@@ -874,21 +805,17 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				}
 			} else if errcode == nil {
 				DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-
 				CreateAutoReduceRecord(&details)
 			}
 		}
-		fmt.Println("newcount9999999999999999999999999999999", goods.NewCount)
-		
+
 		maxNumber = goods.Count
-		
 
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")
 		}
 
 		warehouse.StockCount = warehouse.StockCount - maxNumber
-		fmt.Println("999999999999999", warehouse.StockCount)
 
 		warehouse.Mtime = time.Now().Unix()
 
@@ -902,112 +829,6 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 
 		return nil
 	} else {
-		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
-		// warehouseOutInfo := &models.WarehouseOutInfo{
-		// 	WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-		// 	WarehouseOutId:          warehouseOut.ID,
-		// 	WarehouseInfotId:        warehouse.ID,
-		// 	Status:                  1,
-		// 	Ctime:                   time.Now().Unix(),
-		// 	Remark:                  "",
-		// 	OrgId:                   orgID,
-		// 	Type:                    1,
-		// 	Manufacturer:            0,
-		// 	Dealer:                  0,
-		// 	IsSys:                   1,
-		// 	SysRecordTime:           record_time,
-		// 	GoodTypeId:              goods.GoodTypeId,
-		// 	GoodId:                  goods.GoodId,
-		// 	PatientId:               patient_id,
-		// }
-		// warehouseOutInfo.Count = stock_number
-		// stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
-		// warehouseOutInfo.Price = stockInInfo.Price
-
-		// cur_warehouse, errcode := GetStockInRecoredByGoodId(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID)
-		// if errcode == gorm.ErrRecordNotFound {
-		// 	errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
-
-		// 	if errOne != nil {
-		// 		return errOne
-		// 	} else {
-		// 		details := &models.AutomaticReduceDetail{
-		// 			WarehouseOutId:          warehouseOutInfo.ID,
-		// 			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-		// 			PatientId:               patient_id,
-		// 			Ctime:                   time.Now().Unix(),
-		// 			Mtime:                   time.Now().Unix(),
-		// 			Status:                  1,
-		// 			RecordTime:              record_time,
-		// 			OrgId:                   orgID,
-		// 			GoodId:                  goods.GoodId,
-		// 			GoodTypeId:              goods.GoodTypeId,
-		// 			Count:                   goods.Count,
-		// 		}
-		// 		errTwo := service.AddSigleAutoReduceRecordInfo(details)
-		// 		if errTwo != nil {
-		// 			return errTwo
-		// 		}
-		// 	}
-		// 	// 出库完成后，要将该批次库存清零
-		// 	warehouse.StockCount = 0
-		// 	warehouse.Mtime = time.Now().Unix()
-		// 	errThree := UpDateWarehouseInfoByStock(&warehouse)
-		// 	if errThree != nil {
-		// 		return errThree
-		// 	}
-		// 	// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
-		// 	goods.Count = deliver_number - stock_number
-
-		// 	ConsumablesDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
-		// } else if errcode == nil {
-
-		// 	warehouseOutInfo := &models.WarehouseOutInfo{
-		// 		WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-		// 		WarehouseOutId:          warehouseOut.ID,
-		// 		WarehouseInfotId:        warehouse.ID,
-		// 		Status:                  1,
-		// 		Ctime:                   time.Now().Unix(),
-		// 		Remark:                  "",
-		// 		OrgId:                   orgID,
-		// 		Type:                    1,
-		// 		Manufacturer:            0,
-		// 		Dealer:                  0,
-		// 		IsSys:                   1,
-		// 		SysRecordTime:           record_time,
-		// 		GoodTypeId:              goods.GoodTypeId,
-		// 		GoodId:                  goods.GoodId,
-		// 		PatientId:               patient_id,
-		// 	}
-		// 	warehouseOutInfo.Count = cur_warehouse.Count + StockCount
-		// 	//更新入库详情表
-		// 	UpdateAutoMaticReduceDetail(goods.GoodId, goods.GoodTypeId, record_time, patient_id, orgID, warehouseOutInfo)
-		// 	details := models.BloodAutomaticReduceDetail{
-		// 		WarehouseOutId:          warehouseOutInfo.ID,
-		// 		WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
-		// 		PatientId:               patient_id,
-		// 		Ctime:                   time.Now().Unix(),
-		// 		Mtime:                   time.Now().Unix(),
-		// 		Status:                  1,
-		// 		RecordTime:              record_time,
-		// 		OrgId:                   orgID,
-		// 		GoodId:                  goods.GoodId,
-		// 		GoodTypeId:              goods.GoodTypeId,
-		// 		Count:                   count,
-		// 	}
-		// 	//查询当天耗材是否已经存在数据
-		// 	_, errcode := GetAutoMaticReduceDetail(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-		// 	if errcode == gorm.ErrRecordNotFound {
-		// 		errTwo := CreateAutoReduceRecord(&details)
-		// 		if errTwo != nil {
-		// 			return errTwo
-		// 		}
-		// 	} else if errcode == nil {
-		// 		DeleteAutoRedeceDetailTwo(orgID, patient_id, record_time, goods.GoodId, goods.GoodTypeId)
-
-		// 		CreateAutoReduceRecord(&details)
-		// 	}
-		// }
 		// 出库完成后，要将该批次库存清零
 		warehouse.StockCount = 0
 		warehouse.Mtime = time.Now().Unix()
@@ -1019,7 +840,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		goods.Count = deliver_number - stock_number
 
 		ConsumablesDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
-		
+
 	}
 	return nil
 }
@@ -1117,7 +938,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 
 func GetAutoReduceRecordInfoByPatientId(orgid int64, patient_id int64, recordTime int64) (autoReduce []*models.AutomaticReduceDetail, err error) {
 
-	err = XTReadDB().Model(&autoReduce).Where("org_id = ? and patient_id = ? and record_time = ? and status = 1 and count<>0", orgid, patient_id, recordTime).Find(&autoReduce).Error
+	err = XTReadDB().Model(&autoReduce).Where("org_id = ? and patient_id = ? and record_time = ? and status = 1", orgid, patient_id, recordTime).Find(&autoReduce).Error
 	return autoReduce, err
 }
 
@@ -1127,6 +948,12 @@ func DeleteDialysisBefor(orgid int64, patient_id int64, record_date int64, goodi
 	return err
 }
 
+func DeleteDialysisBeforThree(orgid int64, patient_id int64, record_date int64) error {
+	prepare := models.DialysisBeforePrepare{}
+	err := XTWriteDB().Model(&prepare).Where("user_org_id = ? and patient_id = ? and record_date = ? and status = 1", orgid, patient_id, record_date).Updates(map[string]interface{}{"status": 0, "count": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
 func ConsumablesDeliveryTotalOne(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, goodOne []*models.NewDialysisBeforePrepareGoods) (err error) {
 
 	//查询该患者当天已经出库的耗材信息
@@ -1259,14 +1086,16 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId)
-
+	fmt.Println("err222222222222222222222", warehouse.StockCount)
 	if err != nil {
+		fmt.Println("232323232323进来")
 		return err
 	}
 
 	// 将该批次的剩余库存数量转换为拆零数量
 	stock_number = warehouse.StockCount
-
+	fmt.Println("3434343434343434", stock_number)
+	fmt.Println("8888888888888888888", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 		warehouseOutInfo := &models.WarehouseOutInfo{
@@ -1275,46 +1104,27 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  goods.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
-			IsSys:                   2,
+			Manufacturer:            goods.Manufacturer,
+			Dealer:                  goods.Dealer,
+			IsSys:                   0,
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
+			ExpiryDate:              goods.ExpiryDate,
+			ProductDate:             goods.ProductDate,
+			Number:                  goods.Number,
+			Price:                   goods.Price,
 		}
 		warehouseOutInfo.Count = goods.Count
 		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 
-		//判断当前耗材是否有出库详情记录
-		_, errcode := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, record_time, orgID)
-		if errcode == gorm.ErrRecordNotFound {
-			errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
-			if errOne != nil {
-				return errOne
-			}
-		} else if errcode == nil {
-			warehouseOutInfo := &models.WarehouseOutInfo{
-				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseOut.ID,
-				WarehouseInfotId:        warehouse.ID,
-				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Remark:                  "",
-				OrgId:                   orgID,
-				Type:                    1,
-				Manufacturer:            0,
-				Dealer:                  0,
-				IsSys:                   2,
-				SysRecordTime:           record_time,
-				GoodTypeId:              goods.GoodTypeId,
-				GoodId:                  goods.GoodId,
-			}
-			warehouseOutInfo.Count = goods.Count
-
+		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
 		}
 
 		maxNumber = goods.Count
@@ -1325,15 +1135,10 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 		warehouse.Mtime = time.Now().Unix()
-
 		if warehouse.StockCount < 0 {
+			fmt.Println("进来33232323232232323233232", warehouse.StockCount)
 			return errors.New("库存数量不足")
 		}
-		errThree := UpDateWarehouseInfoByStock(&warehouse)
-		if errThree != nil {
-			return errThree
-		}
-
 		return nil
 	} else {
 		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
@@ -1343,67 +1148,213 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  goods.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
-			IsSys:                   1,
+			Manufacturer:            goods.Manufacturer,
+			Dealer:                  goods.Dealer,
+			IsSys:                   0,
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
+			ExpiryDate:              goods.ExpiryDate,
+			ProductDate:             goods.ProductDate,
+			Number:                  goods.Number,
+			Price:                   goods.Price,
 		}
 		warehouseOutInfo.Count = stock_number
 		stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
 		warehouseOutInfo.Price = stockInInfo.Price
 
-		_, errcode := GetStockInRecoredByGoodIdOne(goods.GoodId, goods.GoodTypeId, record_time, orgID)
-		if errcode == gorm.ErrRecordNotFound {
-			errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
 
-			if errOne != nil {
-				return errOne
-			}
-			// 出库完成后，要将该批次库存清零
-			warehouse.StockCount = 0
-			warehouse.Mtime = time.Now().Unix()
-			errThree := UpDateWarehouseInfoByStock(&warehouse)
-			if errThree != nil {
-				return errThree
-			}
-			// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
-			goods.Count = deliver_number - stock_number
+		if errOne != nil {
+			return errOne
+		}
+		// 出库完成后，要将该批次库存清零
+		warehouse.StockCount = 0
+		warehouse.Mtime = time.Now().Unix()
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
+		}
+		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
+		goods.Count = deliver_number - stock_number
 
-			ConsumablesDeliveryOne(orgID, record_time, goods, warehouseOut, count)
-		} else if errcode == nil {
+		ConsumablesDeliveryOne(orgID, record_time, goods, warehouseOut, count)
 
-			warehouseOutInfo := &models.WarehouseOutInfo{
-				WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseOut.ID,
-				WarehouseInfotId:        warehouse.ID,
-				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Remark:                  "",
+	}
+	return nil
+}
+
+//耗材出库删除
+func ConsumablesDeliveryDeleteOne(orgID int64, record_time int64, good_yc *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut) (err error) {
+	// 先根据相关信息查询当天该耗材的出库信息
+	warehouseOutInfos, err := FindStockOutInfoByStockOne(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time)
+	if err != nil {
+		return err
+	}
+
+	var delete_count int64 = 0
+
+	for _, ware := range warehouseOutInfos {
+		// 判断当前出库的数据和删除出库数量
+		if good_yc.Count <= ware.Count {
+			delete_count = good_yc.Count
+		} else {
+			delete_count = ware.Count
+		}
+		// 在出库记录表里记录退库详情
+		warehouseOutInfo := &models.WarehouseOutInfo{
+			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+			WarehouseOutId:          warehouseOut.ID,
+			//WarehouseInfoId:		 warehouse.ID,
+			Status:        1,
+			Ctime:         time.Now().Unix(),
+			Remark:        "",
+			OrgId:         orgID,
+			Type:          1,
+			Manufacturer:  0,
+			Dealer:        0,
+			IsSys:         0,
+			SysRecordTime: record_time,
+			GoodTypeId:    good_yc.GoodTypeId,
+			GoodId:        good_yc.GoodId,
+		}
+		warehouseOutInfo.Count = delete_count
+		stockInInfo, _ := FindLastStockInInfoRecord(good_yc.GoodId, orgID)
+		warehouseOutInfo.Price = stockInInfo.Price
+		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		if errOne != nil {
+			return errOne
+		}
+		// 删除出库完成后，要增加对应批次的库存数量
+
+		errThree := UpDateWarehouseInfoByStockDelete(ware.WarehouseInfotId, delete_count)
+		if errThree != nil {
+			return errThree
+		}
+
+		// 增加了对应的库存后，看看还有多少需要退库的
+		good_yc.Count = good_yc.Count - delete_count
+		if good_yc.Count == 0 {
+			return nil
+		}
+	}
+
+	if good_yc.Count == 0 {
+		return nil
+	} else {
+		return errors.New("退库和出库数据不匹配")
+	}
+}
+
+func ConsumablesDeliveryTotalSix(orgID int64, patient_id int64, record_time int64, goods []*models.DialysisBeforePrepareGoods, goodOne []*models.NewDialysisBeforePrepareGoods) (err error) {
+
+	//查询该患者当天已经出库的耗材信息
+	goods_yc, _ := FindConsumablesByDateThree(orgID, patient_id, record_time)
+	// 和新请求的出库数据进行对比，分出那些是继续出库的，那些是需要删除出库的
+	for i := len(goods_yc) - 1; i >= 0; i-- {
+		goods_yc_temp := goods_yc[i]
+		for j := len(goods) - 1; j >= 0; j-- {
+			goods_temp := goods[j]
+			// 已经出库和新请求出库都存在该耗材，则判断出库数量，分成是继续出库，还是删除出库
+			if goods_yc_temp.GoodTypeId == goods_temp.GoodTypeId && goods_yc_temp.GoodId == goods_temp.GoodId {
+				// 已经出库和新请求出库的出库数量一致，则清除两个结构体里的数据（既不出库，也不删除出库）
+				if goods_yc_temp.Count == goods_temp.Count {
+					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
+					goods = append(goods[:j], goods[j+1:]...)
+					break
+				}
+				// 如果已经出库的数量 大于 新请求出库的数量，则代表需要删除出库
+				if goods_yc_temp.Count > goods_temp.Count {
+
+					temp_count := goods_yc_temp.Count - goods_temp.Count
+					goods_yc[i].Count = temp_count
+					goods = append(goods[:j], goods[j+1:]...)
+					break
+				}
+				// 如果已经出库的数量 小于 新请求出库的梳理，则代表需要增加出库
+				if goods_yc_temp.Count < goods_temp.Count {
+					temp_count := goods_temp.Count - goods_yc_temp.Count
+					//fmt.Println("988888888888888", temp_count)
+					goods[j].Count = temp_count
+					goods_yc = append(goods_yc[:i], goods_yc[i+1:]...)
+					//fmt.Println("888888888", goods_yc)
+					break
+				}
+			}
+		}
+	}
+
+	// goods_yc 这个数据就是需要已经出库了，但是现在需要删除出库的耗材数据
+	// goods 这个数据就是需要出库的耗材的数据(新增的数据)
+	fmt.Println("goods222222222222", goods)
+	fmt.Println("goodsy999999999999", goods_yc)
+	if len(goods) > 0 {
+		out, err := FindStockOutByIsSys(orgID, 1, record_time)
+		if err == gorm.ErrRecordNotFound {
+			//没有记录，则创建出库单
+			timeStr := time.Now().Format("2006-01-02")
+			timeArr := strings.Split(timeStr, "-")
+			total, _ := FindAllWarehouseOut(orgID)
+			total = total + 1
+			warehousing_out_order := strconv.FormatInt(orgID, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
+			number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
+			number = number + total
+			warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+			warehouseOut := models.WarehouseOut{
+				WarehouseOutOrderNumber: warehousing_out_order,
+				OperationTime:           time.Now().Unix(),
 				OrgId:                   orgID,
-				Type:                    1,
-				Manufacturer:            0,
+				Creater:                 0,
+				Ctime:                   time.Now().Unix(),
+				Status:                  1,
+				WarehouseOutTime:        record_time,
 				Dealer:                  0,
+				Manufacturer:            0,
+				Type:                    1,
 				IsSys:                   1,
-				SysRecordTime:           record_time,
-				GoodTypeId:              goods.GoodTypeId,
-				GoodId:                  goods.GoodId,
 			}
-			warehouseOutInfo.Count = goods.Count
-			//更新入库详情表
-			UpdateAutoMaticReduceDetailOne(goods.GoodId, goods.GoodTypeId, record_time, orgID, warehouseOutInfo)
+			err := AddSigleWarehouseOut(&warehouseOut)
+			if err != nil {
+				utils.TraceLog("创建出库单失败 err = %v", err)
+				return err
+			} else {
+				out = warehouseOut
+			}
+		}
+
+		for _, item := range goods {
+			var newCount int64 = 0
+			for _, it := range goodOne {
+				if item.GoodTypeId == it.GoodTypeId && item.GoodId == it.GoodId {
+					newCount = it.Count
+				}
+			}
+			prepare := models.DialysisBeforePrepare{
+				GoodTypeId: item.GoodTypeId,
+				GoodId:     item.GoodId,
+				Count:      item.Count,
+			}
+
+			ConsumablesDelivery(orgID, patient_id, record_time, &prepare, &out, newCount)
 		}
 
 	}
+
+	if len(goods_yc) > 0 {
+		for _, good_yc := range goods_yc {
+			out, _ := FindStockOutByIsSys(orgID, 1, record_time)
+			ConsumablesDeliveryDeleteThree(orgID, record_time, good_yc, &out)
+		}
+	}
+
 	return nil
 }
 
 //耗材出库删除
-func ConsumablesDeliveryDeleteOne(orgID int64, record_time int64, good_yc *models.DialysisBeforePrepare, warehouseOut *models.WarehouseOut) (err error) {
+func ConsumablesDeliveryDeleteThree(orgID int64, record_time int64, good_yc *models.BloodAutomaticReduceDetail, warehouseOut *models.WarehouseOut) (err error) {
 	// 先根据相关信息查询当天该耗材的出库信息
 	warehouseOutInfos, err := FindStockOutInfoByStockOne(orgID, good_yc.GoodTypeId, good_yc.GoodId, record_time)
 	if err != nil {
@@ -1431,7 +1382,7 @@ func ConsumablesDeliveryDeleteOne(orgID int64, record_time int64, good_yc *model
 			Type:          1,
 			Manufacturer:  0,
 			Dealer:        0,
-			IsSys:         2,
+			IsSys:         0,
 			SysRecordTime: record_time,
 			GoodTypeId:    good_yc.GoodTypeId,
 			GoodId:        good_yc.GoodId,