Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 #

controllers/drug_stock_api_contorller.go

@@ -246,7 +246,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					warehouseInfo.StockMinNumber = 0
 					warehouseInfo.MaxUnit = min_unit
 				}
-				if max_unit == medical.MinUnit {
+				if max_unit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
 					warehouseInfo.StockMaxNumber = 0
 					warehouseInfo.StockMinNumber = warehousing_count
 					warehouseInfo.MaxUnit = min_unit
@@ -278,6 +278,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				if medical.MaxUnit == medical.MinUnit {
 					drugflow.MaxUnit = min_unit
+
 				}
 				if max_unit == medical.MinUnit {
 					warehouseInfo.MaxUnit = min_unit
@@ -602,7 +603,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						warehouseInfo.StockMinNumber = 0
 						warehouseInfo.MaxUnit = min_unit
 					}
-					if max_unit == medical.MinUnit {
+					if max_unit == medical.MinUnit && medical.MaxUnit != medical.MinUnit {
 						warehouseInfo.StockMaxNumber = 0
 						warehouseInfo.StockMinNumber = warehousing_count
 						warehouseInfo.MaxUnit = min_unit
@@ -641,7 +642,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						warehouseInfo.MaxUnit = min_unit
 					}
 
-					if max_unit == medical.MinUnit {
+					if max_unit == medical.MinUnit && medical.MinUnit != medical.MaxUnit {
 						warehouseInfo.StockMaxNumber = 0
 						warehouseInfo.StockMinNumber = warehousing_count
 						warehouseInfo.MaxUnit = min_unit

controllers/schedule_api_controller.go

@@ -753,6 +753,8 @@ func (this *ScheduleApiController) UrgentScheduleData() {
 func (this *ScheduleApiController) SearchSchedulePatients() {
 	keywords := this.GetString("keywords")
 	week_type, _ := this.GetInt64("week_type", 0)
+	start_sch := this.GetString("start_sch")
+	end_sch := this.GetString("end_sch")
 
 	thisTime1 := time.Now()
 	thisTime2 := time.Now()
@@ -765,9 +767,22 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 
 	switch week_type {
 	case 1:
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+
+		var startSchTime int64
+		if len(start_sch) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_sch+" 00:00:00", loc)
+			startSchTime = theTime.Unix()
+		}
+		var endSchTime int64
+		if len(end_sch) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_sch+" 00:00:00", loc)
+			endSchTime = theTime.Unix()
+		}
 
 		adminUserInfo := this.GetAdminUserInfo()
-		list, _ := service.GetSchedualPatientsByKeywords(keywords, adminUserInfo.CurrentOrgId)
+		list, _ := service.GetSchedualPatientsByKeywords(keywords, adminUserInfo.CurrentOrgId, startSchTime, endSchTime)
 		this.ServeSuccessJSON(map[string]interface{}{
 			"schdules": list,
 		})

controllers/stock_in_api_controller.go

@@ -212,8 +212,16 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+
 				total := float64(warehousing_count) * price
 
+				if items["packing_price"] == nil || reflect.TypeOf(items["packing_price"]).String() != "string" {
+					utils.ErrorLog("packing_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				packing_price, _ := strconv.ParseFloat(items["packing_price"].(string), 64)
+
 				var productDates int64
 				var expiryDates int64
 
@@ -274,6 +282,7 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					StockCount:       warehousing_count,
 					Dealer:           dealer,
 					LicenseNumber:    license_number,
+					PackingPrice:     packing_price,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -521,7 +530,12 @@ func (c *StockManagerApiController) EditWarehouse() {
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 				total := float64(warehousing_count) * price
-
+				if items["packing_price"] == nil || reflect.TypeOf(items["packing_price"]).String() != "string" {
+					utils.ErrorLog("packing_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				packing_price, _ := strconv.ParseFloat(items["packing_price"].(string), 64)
 				var productDates int64
 				var expiryDates int64
 
@@ -588,6 +602,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						Dealer:           dealer,
 						StockCount:       warehousing_count,
 						LicenseNumber:    license_number,
+						PackingPrice:     packing_price,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -613,6 +628,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 						Manufacturer:     manufacturer,
 						Dealer:           dealer,
 						LicenseNumber:    license_number,
+						PackingPrice:     packing_price,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 
@@ -703,9 +719,18 @@ func (c *StockManagerApiController) EditWarehouse() {
 				goodinfo := models.WarehousingInfo{
 					WarehousingCount: item.WarehousingCount,
 					StockCount:       info.StockCount + total,
+					Price:            item.Price,
+					Manufacturer:     item.Manufacturer,
+					Number:           item.Number,
+					ProductDate:      item.ProductDate,
+					ExpiryDate:       item.ExpiryDate,
+					LicenseNumber:    item.LicenseNumber,
+					Dealer:           item.Dealer,
+					Remark:           item.Remark,
+					PackingPrice:     item.PackingPrice,
 				}
 
-				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
+				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
 
 				//flowStock := models.VmStockFlow{
 				//	Count:         item.WarehousingCount,
@@ -736,8 +761,17 @@ func (c *StockManagerApiController) EditWarehouse() {
 				goodinfo := models.WarehousingInfo{
 					WarehousingCount: item.WarehousingCount,
 					StockCount:       info.StockCount - total,
+					Price:            item.Price,
+					Manufacturer:     item.Manufacturer,
+					Number:           item.Number,
+					ProductDate:      item.ProductDate,
+					ExpiryDate:       item.ExpiryDate,
+					LicenseNumber:    item.LicenseNumber,
+					Dealer:           item.Dealer,
+					Remark:           item.Remark,
+					PackingPrice:     item.PackingPrice,
 				}
-				service.UpdateWarehouseInfoByGoodId(goodinfo, item.ID)
+				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
 				//改变库存
 				good, _ := service.GetLastInfoMationById(info.GoodId)
 				warhouseCount := strconv.FormatInt(total, 10)
@@ -761,6 +795,7 @@ func (c *StockManagerApiController) EditWarehouse() {
 					LicenseNumber:    item.LicenseNumber,
 					Dealer:           item.Dealer,
 					Remark:           item.Remark,
+					PackingPrice:     item.PackingPrice,
 				}
 				service.UpdateWarehouseInfoByGoodIdOne(goodinfo, item.ID)
 			}
@@ -7248,10 +7283,14 @@ func (this *StockManagerApiController) SaveStockInventoryList() {
 				ExpireDate:              expiry_date,
 				ReturnCount:             0,
 			}
-
+			// warehosueinfos, _ := service.GetWarehouseInfoByIdNight(id)
 			info := models.WarehousingInfo{
 				StockCount: last_stock_count,
 			}
+
+			//if(last_stock_count > warehosueinfos.StockCount){
+			//  info.WarehousingCount = last_stock_count
+			//}
 			//更改库存
 			service.UpdatedWarehousingInfo(info, id)
 			if stock_count != last_stock_count {

models/self_drug_models.go

@@ -675,6 +675,7 @@ type VmDrugWarehouseOutInfo struct {
 	DrugName                string  `json:"drug_name"`
 	Number                  string  `gorm:"column:number" json:"number" form:"number"`
 	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	MedicalInsuranceNumber  string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 }
 
 type XtDrugAdjustPrice struct {

models/stock_models.go

@@ -131,6 +131,7 @@ type WarehousingInfo struct {
 	Type             int64       `gorm:"column:type" json:"type"`
 	LicenseNumber    string      `gorm:"column:license_number" json:"license_number" form:"license_number"`
 	WarehouseInfoId  int64       `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice     float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 }
 
 func (WarehousingInfo) TableName() string {
@@ -442,38 +443,39 @@ type VmWarehouseInfo struct {
 }
 
 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"`
-	LicenseNumber           string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	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"`
+	LicenseNumber               string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
 }
 
 type WarehouseOutInfoTwo struct {

service/gobal_config_service.go

@@ -809,7 +809,7 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 		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.count_unit,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,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,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,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 
@@ -830,7 +830,7 @@ func GetSingeOrderFlow(id int64, orgid int64) (outInfo []*models.VmDrugWarehouse
 		db = db.Where("x.warehouse_out_id in(?)", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.count_unit,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,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&outInfo).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.count,x.count_unit,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.retail_price,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&outInfo).Error
 	return outInfo, err
 }
 

service/mobile_dialysis_service.go

@@ -2025,51 +2025,63 @@ func ModifyFinishDialysisOrder(order *models.DialysisOrder) error {
 	tx.Commit()
 	return err
 }
-
 func MobileGetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDryweight, error) {
 	var record models.SgjPatientDryweight
-	redis := RedisClient()
-	defer redis.Close()
-
-	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":last_dry_weight"
-	last_dry_weight_str, _ := redis.Get(key).Result()
-
-	if len(last_dry_weight_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
-		err := readDb.Model(&models.SgjPatientDryweight{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
-		if err != nil {
-			if err == gorm.ErrRecordNotFound {
-				if record.ID <= 0 {
-					redis.Set(key, "null", time.Second*60*60*18)
-				}
-				return nil, nil
-			} else {
-				return nil, err
-			}
-		} else {
-			if record.ID > 0 {
-				//缓存数据
-				last_dry_weight_str, err := json.Marshal(record)
-				if err == nil {
-					redis.Set(key, last_dry_weight_str, time.Second*60*60*18)
-					return nil, err
-				}
-			} else {
-				redis.Set(key, "null", time.Second*60*60*18)
-				return nil, err
-			}
-			return &record, nil
-		}
-	} else { //缓存数据了数据，将redis缓存的json字符串转为map
-		if last_dry_weight_str == "null" {
-			return &record, nil
+	err := readDb.Model(&models.SgjPatientDryweight{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
 		} else {
-			json.Unmarshal([]byte(last_dry_weight_str), &record)
-			return &record, nil
+			return nil, err
 		}
-
 	}
+	return &record, nil
 }
 
+//func MobileGetLastDryWeight(orgID int64, patientID int64) (*models.SgjPatientDryweight, error) {
+//	var record models.SgjPatientDryweight
+//	redis := RedisClient()
+//	defer redis.Close()
+//
+//	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":last_dry_weight"
+//	last_dry_weight_str, _ := redis.Get(key).Result()
+//
+//	if len(last_dry_weight_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
+//		err := readDb.Model(&models.SgjPatientDryweight{}).Where("patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).Last(&record).Error
+//		if err != nil {
+//			if err == gorm.ErrRecordNotFound {
+//				if record.ID <= 0 {
+//					redis.Set(key, "null", time.Second*60*60*18)
+//				}
+//				return nil, nil
+//			} else {
+//				return nil, err
+//			}
+//		} else {
+//			if record.ID > 0 {
+//				//缓存数据
+//				last_dry_weight_str, err := json.Marshal(record)
+//				if err == nil {
+//					redis.Set(key, last_dry_weight_str, time.Second*60*60*18)
+//					return nil, err
+//				}
+//			} else {
+//				redis.Set(key, "null", time.Second*60*60*18)
+//				return nil, err
+//			}
+//			return &record, nil
+//		}
+//	} else { //缓存数据了数据，将redis缓存的json字符串转为map
+//		if last_dry_weight_str == "null" {
+//			return &record, nil
+//		} else {
+//			json.Unmarshal([]byte(last_dry_weight_str), &record)
+//			return &record, nil
+//		}
+//
+//	}
+//}
+
 // 透析方案
 func MobileGetDialysisSolutionByModeIdSix(orgID int64, patientID int64, mode_id int64) (*models.DialysisSolution, error) {
 	var record models.DialysisSolution

service/role_service.go

@@ -1,14 +1,14 @@
 package service
 
 import (
+	"XT_New/models"
+	"XT_New/utils"
 	"database/sql"
+	"encoding/json"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-	"encoding/json"
-	"XT_New/models"
-	"XT_New/utils"
 
 	"github.com/jinzhu/gorm"
 )
@@ -131,9 +131,10 @@ type AdminUserManageViewModel struct {
 	TitleName       string `gorm:"-" json:"title_name"`
 	IsSubSuperAdmin bool   `gorm:"-" json:"is_sub_super_admin"`
 	//mobile          string `gorm:"-" json:"mobile"`
-	Sort     int `gorm:"sort" json:"sort"`
-	IsMark   int `gorm:"is_mark" json:"is_mark"`
-	UserType int `gorm:"user_type" json:"user_type"`
+	Sort         int    `gorm:"sort" json:"sort"`
+	IsMark       int    `gorm:"is_mark" json:"is_mark"`
+	UserType     int    `gorm:"user_type" json:"user_type"`
+	DoctorNumber string `gorm:"column:doctor_number" json:"doctor_number" form:"doctor_number"`
 }
 
 func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([]*AdminUserManageViewModel, int, error) {
@@ -144,7 +145,7 @@ func GetAdminUsersAndLoginInfo(orgID int64, appID int64, page int, count int) ([
 		page = 1
 	}
 	var viewModels []*AdminUserManageViewModel = make([]*AdminUserManageViewModel, 0)
-	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids,u_a_r.sort,u_a_r.is_mark,u_a_r.user_type FROM sgj_user_admin_role AS u_a_r   LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ?  ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l  ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id  LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
+	rows, err := readUserDb.Raw("SELECT u_a_r.admin_user_id, u_a_r.user_name,u_a_r.doctor_number, u_a_r.user_title, u_l.ip, u_l.ctime, u_a_r.status,u_a_r.avatar,u_a_r.role_ids,u_a_r.sort,u_a_r.is_mark,u_a_r.user_type FROM sgj_user_admin_role AS u_a_r   LEFT JOIN (SELECT * FROM (SELECT admin_user_id, org_id, app_id, ip, ctime FROM sgj_user_admin_login_log WHERE org_id = ? AND app_id = ?  ORDER BY ctime DESC) AS t GROUP BY admin_user_id) AS u_l  ON u_a_r.org_id = u_l.org_id AND u_a_r.app_id = u_l.app_id AND u_a_r.admin_user_id = u_l.admin_user_id WHERE u_a_r.org_id = ? AND u_a_r.app_id = ? GROUP BY u_a_r.admin_user_id  LIMIT ? OFFSET ?;", orgID, appID, orgID, appID, count, (page-1)*count).Rows()
 	defer rows.Close()
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
@@ -795,7 +796,7 @@ func GetUserAllRole(org_id int64, admin_user_id int64) (role models.App_Role, er
 	defer redis.Close()
 
 	// cur_date := time.Now().Format("2006-01-02")
-	key := "user_all_role:" + strconv.FormatInt(org_id, 10) + ":"+ strconv.FormatInt(admin_user_id, 10)
+	key := "user_all_role:" + strconv.FormatInt(org_id, 10) + ":" + strconv.FormatInt(admin_user_id, 10)
 	role_str, _ := redis.Get(key).Result()
 
 	if len(role_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis

service/schedule_service.go

@@ -446,7 +446,7 @@ func GetSchedualPatientsByKeywordsAndWeek(keywords string, org_id int64, start_t
 
 }
 
-func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*models.Schedule, err error) {
+func GetSchedualPatientsByKeywords(keywords string, org_id int64, startime int64, endtime int64) (schedule []*models.Schedule, err error) {
 	likeKey := "%" + keywords + "%"
 
 	err = readDb.
@@ -456,7 +456,7 @@ func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*m
 		Preload("DeviceNumber", "status = 1 ").
 		Preload("TreatmentMode", "status = 1 ").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id AND (p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).
-		Where("s.user_org_id=? and s.schedule_date >= UNIX_TIMESTAMP(DATE_FORMAT(NOW(),'%Y-%m-%d 00:00:00')) and s.schedule_date <= UNIX_TIMESTAMP(DATE_FORMAT( SUBDATE(CURDATE(),DATE_FORMAT(CURDATE(),'%w')-7), '%Y-%m-%d 23:59:59')) and s.status=1", org_id).
+		Where("s.user_org_id=? and s.schedule_date >= ? and s.schedule_date <= ? and s.status=1", org_id, startime, endtime).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
 		Order("schedule_date asc").
 		Find(&schedule).Error

service/stock_service.go

@@ -411,11 +411,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,license_number) 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,packing_price) 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)
@@ -436,6 +436,7 @@ func CreateWarehousingInfo(warehousingInfo []*models.WarehousingInfo) (err error
 				insertData = append(insertData, info.Type)
 				insertData = append(insertData, info.WarehousingCount)
 				insertData = append(insertData, info.LicenseNumber)
+				insertData = append(insertData, info.PackingPrice)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -3850,7 +3851,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 		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,x.license_number,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.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,t.social_security_directory_code,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,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.warehouse_out_id,x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -5229,6 +5230,13 @@ func GetInventoryDetailById(id []string) (list []*models.XtStockInventory, err e
 	return list, err
 }
 
+func GetWarehouseInfoByIdNight(id int64) (models.WarehousingInfo, error) {
+
+	info := models.WarehousingInfo{}
+	err := XTReadDB().Where("id = ? and status = 1", id).Find(&info).Error
+	return info, err
+}
+
 func GetWarehouseInfoById(id int64) (models.WarehousingInfo, error) {
 
 	info := models.WarehousingInfo{}
@@ -5493,7 +5501,7 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice}).Error
 	return err
 }
 

service/warhouse_service.go

@@ -101,6 +101,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
+	fmt.Println(drug_price)
 
 	if advice.PrescribingNumberUnit == drup.MinUnit {
 		drug_price = drup.MinPrice
@@ -145,9 +146,9 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			CountUnit:               drup.MinUnit,
-			RetailPrice:             drug_price,
+			RetailPrice:             warehouse.RetailPrice,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -163,7 +164,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   deliver_number, //按最小单位计算,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -278,7 +279,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			CountUnit:               drup.MinUnit,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
@@ -318,7 +319,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			ProductDate:       warehouse.ProductDate,
 			ExpiryDate:        warehouse.ExpiryDate,
 			WarehousingCount:  warehouse.WarehousingCount,
-			Price:             warehouse.Price,
+			Price:             warehouse.RetailPrice,
 			TotalPrice:        warehouse.TotalPrice,
 			Dealer:            warehouse.Dealer,
 			Manufacturer:      warehouse.Manufacturer,
@@ -354,7 +355,7 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   stock_number,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -477,7 +478,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 	if advice.PrescribingNumberUnit != drup.MaxUnit && advice.PrescribingNumberUnit != drup.MinUnit {
 		min_price = drup.RetailPrice
 	}
-
+	fmt.Println(min_price)
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
 
@@ -511,9 +512,9 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   min_price,
+			Price:                   warehouse.RetailPrice,
 			CountUnit:               drup.MinUnit,
-			RetailPrice:             min_price,
+			RetailPrice:             warehouse.RetailPrice,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -530,7 +531,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   deliver_number,
-			Price:                   min_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -659,8 +660,8 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   min_price,
-			RetailPrice:             min_price,
+			Price:                   warehouse.RetailPrice,
+			RetailPrice:             warehouse.RetailPrice,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -678,7 +679,7 @@ func HisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   stock_number,
-			Price:                   min_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -926,7 +927,7 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 		}
 		warehouseOutInfo.Count = stock_number
 
-		warehouseOutInfo.CountUnit = advice.CountUnit
+		//warehouseOutInfo.CountUnit = advice.CountUnit
 
 		errOne := AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
@@ -1124,7 +1125,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			PatientId:               patient_id,
 			Number:                  warehouse.Number,
 			LicenseNumber:           warehouse.LicenseNumber,
-			Price:                   info.PackingPrice,
+			Price:                   warehouse.PackingPrice,
 			ExpiryDate:              warehouse.ExpiryDate,
 			ProductDate:             warehouse.ProductDate,
 			ProjectId:               goods.ProjectId,
@@ -1172,7 +1173,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
 				Count:                   deliver_number,
-				Price:                   info.PackingPrice,
+				Price:                   warehouse.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -1207,7 +1208,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					ProductDate:             warehouse.ProductDate,
 					ExpireDate:              warehouse.ExpiryDate,
 					Count:                   exsit.Count + goods.Count,
-					Price:                   info.PackingPrice,
+					Price:                   warehouse.PackingPrice,
 					Status:                  1,
 					Ctime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
@@ -1241,7 +1242,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
 				Count:                   deliver_number,
-				Price:                   info.PackingPrice,
+				Price:                   warehouse.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -1275,7 +1276,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					ProductDate:             warehouse.ProductDate,
 					ExpireDate:              warehouse.ExpiryDate,
 					Count:                   exsit.Count + goods.Count,
-					Price:                   info.PackingPrice,
+					Price:                   warehouse.PackingPrice,
 					Status:                  1,
 					Ctime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
@@ -1341,7 +1342,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			PatientId:               patient_id,
 			Number:                  warehouse.Number,
 			LicenseNumber:           warehouse.LicenseNumber,
-			Price:                   info.PackingPrice,
+			Price:                   warehouse.PackingPrice,
 			ExpiryDate:              warehouse.ExpiryDate,
 			ProductDate:             warehouse.ProductDate,
 			ProjectId:               goods.ProjectId,
@@ -1365,7 +1366,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
 				Count:                   stock_number,
-				Price:                   info.PackingPrice,
+				Price:                   warehouse.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -1397,7 +1398,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					ProductDate:             warehouse.ProductDate,
 					ExpireDate:              warehouse.ExpiryDate,
 					Count:                   exsit.Count + goods.Count,
-					Price:                   info.PackingPrice,
+					Price:                   warehouse.PackingPrice,
 					Status:                  1,
 					Ctime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
@@ -1434,7 +1435,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				ProductDate:             warehouse.ProductDate,
 				ExpireDate:              warehouse.ExpiryDate,
 				Count:                   stock_number,
-				Price:                   info.PackingPrice,
+				Price:                   warehouse.PackingPrice,
 				Status:                  1,
 				Ctime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
@@ -1466,7 +1467,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					ProductDate:             warehouse.ProductDate,
 					ExpireDate:              warehouse.ExpiryDate,
 					Count:                   exsit.Count + goods.Count,
-					Price:                   info.PackingPrice,
+					Price:                   warehouse.PackingPrice,
 					Status:                  1,
 					Ctime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
@@ -1694,7 +1695,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			Mtime:                   0,
-			Price:                   goods.Price,
+			Price:                   warehouse.PackingPrice,
 			WarehousingDetailId:     0,
 			WarehouseOutDetailId:    warehouseOutInfo.ID,
 			CancelOutDetailId:       0,
@@ -1742,7 +1743,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			ExpiryDate:              goods.ExpiryDate,
 			ProductDate:             goods.ProductDate,
 			Number:                  warehouse.Number,
-			Price:                   goods.Price,
+			Price:                   warehouse.PackingPrice,
 			LicenseNumber:           goods.LicenseNumber,
 		}
 		warehouseOutInfo.Count = stock_number
@@ -1785,7 +1786,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			Mtime:                   0,
-			Price:                   goods.Price,
+			Price:                   warehouse.PackingPrice,
 			WarehousingDetailId:     0,
 			WarehouseOutDetailId:    warehouseOutInfo.ID,
 			CancelOutDetailId:       0,
@@ -1850,7 +1851,7 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 			ExpiryDate:              goods.ExpiryDate,
 			ProductDate:             goods.ProductDate,
 			Number:                  goods.Number,
-			Price:                   goods.Price,
+			Price:                   warehouse.PackingPrice,
 			LicenseNumber:           goods.LicenseNumber,
 			ConsumableType:          2,
 		}
@@ -1900,7 +1901,7 @@ func ConsumablesDeliveryTwo(orgID int64, goods *models.WarehouseOutInfo, count i
 			ExpiryDate:              goods.ExpiryDate,
 			ProductDate:             goods.ProductDate,
 			Number:                  goods.Number,
-			Price:                   goods.Price,
+			Price:                   warehouse.PackingPrice,
 			LicenseNumber:           goods.LicenseNumber,
 			ConsumableType:          2,
 		}
@@ -1990,7 +1991,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			CountUnit:               drup.MinUnit,
 			RetailPrice:             drug_price,
 			ProductDate:             warehouse.ProductDate,
@@ -2009,7 +2010,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   deliver_number, //按最小单位计算,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -2116,7 +2117,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			CountUnit:               drup.MinUnit,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
@@ -2207,7 +2208,7 @@ func NewDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *mo
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   deliver_number,
-			Price:                   drug_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -2264,7 +2265,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 	if advice.PrescribingNumberUnit != drup.MaxUnit && advice.PrescribingNumberUnit != drup.MinUnit {
 		min_price = drup.RetailPrice
 	}
-
+	fmt.Println(min_price)
 	// 根据先进先出原则，查询最先入库的批次，进行出库
 	// 如果没有对应的库存，则报错
 	//开启事物
@@ -2298,9 +2299,9 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   min_price,
+			Price:                   warehouse.RetailPrice,
 			CountUnit:               drup.MinUnit,
-			RetailPrice:             min_price,
+			RetailPrice:             warehouse.RetailPrice,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -2317,7 +2318,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   deliver_number,
-			Price:                   min_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -2418,8 +2419,8 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
 			BatchNumber:             warehouse.BatchNumber,
-			Price:                   min_price,
-			RetailPrice:             min_price,
+			Price:                   warehouse.RetailPrice,
+			RetailPrice:             warehouse.RetailPrice,
 			ProductDate:             warehouse.ProductDate,
 			ExpiryDate:              warehouse.ExpiryDate,
 			PatientId:               advice.PatientId,
@@ -2437,7 +2438,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			ProductDate:             warehouse.ProductDate,
 			ExpireDate:              warehouse.ExpiryDate,
 			Count:                   stock_number,
-			Price:                   min_price,
+			Price:                   warehouse.RetailPrice,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			UserOrgId:               orgID,
@@ -2489,7 +2490,7 @@ func NewHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout
 			ProductDate:       warehouse.ProductDate,
 			ExpiryDate:        warehouse.ExpiryDate,
 			WarehousingCount:  warehouse.WarehousingCount,
-			Price:             warehouse.Price,
+			Price:             warehouse.RetailPrice,
 			TotalPrice:        warehouse.TotalPrice,
 			Dealer:            warehouse.Dealer,
 			Manufacturer:      warehouse.Manufacturer,