历史排班

controllers/gobal_config_api_controller.go

@@ -2426,7 +2426,7 @@ func (c *GobalConfigApiController) GetExportOutOrderDrugList() {
 	orderId := c.GetString("order_id")
 	ids := strings.Split(orderId, ",")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
-	//list, _ := service.GetExportOutOrderDrugList(ids)
+
 	list, _ := service.GetExportOutOrderDrugListOne(ids)
 	outInfoList, _ := service.GetDrugOutListFlow(ids, orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)

controllers/his_api_controller.go

@@ -1999,7 +1999,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												return
 											}
 
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+											if adminInfo.CurrentOrgId == 10215 {
 												if prescribing_number > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -2016,7 +2016,7 @@ func (c *HisApiController) CreateHisPrescription() {
 												c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 												return
 											}
-											if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+											if adminInfo.CurrentOrgId == 10215 {
 												if num > batch_number_all_count {
 													c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 													return
@@ -2085,7 +2085,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -2103,7 +2103,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
@@ -2159,7 +2159,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														// 查询该药品最后一次出库记录
 														outInfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(drug_id, patient_id, recordDateTime, adviceId)
 
@@ -2319,7 +2319,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														if prescribing_number > batch_number_all_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -2337,7 +2337,7 @@ func (c *HisApiController) CreateHisPrescription() {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 															return
 														}
-														if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+														if adminInfo.CurrentOrgId == 10215 {
 															if prescribing_number > batch_number_all_count {
 																c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 																return
@@ -2386,7 +2386,7 @@ func (c *HisApiController) CreateHisPrescription() {
 														c.ServeDynamicFailJsonSend(drug.DrugName + "库存不足")
 														return
 													}
-													if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 3877 {
+													if adminInfo.CurrentOrgId == 10215 {
 														if (number_count - device_number) > batch_number_count {
 															c.ServeDynamicFailJsonSend(drug.DrugName + "该批次剩余库存不足,剩余库存:" + strconv.FormatInt(info.StockMaxNumber, 10) + drug.MaxUnit + strconv.FormatInt(info.StockMinNumber, 10) + drug.MinUnit)
 															return
@@ -3068,6 +3068,9 @@ func (c *HisApiController) CreateHisPrescription() {
 									if p.Price != lastWarehouse.PackingPrice {
 										p.Price = lastWarehouse.PackingPrice
 									}
+									if p.Unit == "" {
+										p.Unit = lastWarehouse.WarehousingUnit
+									}
 								}
 
 							}

controllers/self_drug_api_congtroller.go

@@ -2770,11 +2770,6 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 		ids = append(ids, it.ID)
 	}
 
-	//infoList, _ := service.GetGoodWarehouseInfoByOrgId(orgId, storehouse_id)
-	//for _, it := range infoList {
-	//	goodIds = append(goodIds, it.GoodId)
-	//}
-
 	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids)
 
 	if err != nil {

models/self_drug_models.go

@@ -586,6 +586,8 @@ type BloodDrugWarehouseOutInfo struct {
 	DoseUnit                string  `json:"dose_unit"`
 	LastPrice               float64 `json:"last_price"`
 	StorehouseId            int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	InPrice                 float64 `gorm:"column:price" json:"in_price" form:"price"`
+	WarehousingInfoId       int64   `gorm:"column:warehousing_info_id" json:"warehousing_info_id" form:"warehousing_info_id"`
 }
 
 type XtMonitorConfig struct {
@@ -650,6 +652,7 @@ type StDrugWarehouseInfo struct {
 	PackingUnit      string  `json:"packing_unit"`
 	Dosage           int64   `json:"dosage"`
 	LimaxUnit        string  `json:"limax_unit"`
+	WarehousingTime  int64   `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
 }
 
 type VmDrugWarehouseOutInfo struct {
@@ -929,36 +932,37 @@ type VmDrugInventory struct {
 }
 
 type SgjDrugWarehouseOutInfo 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"`
-	WarehouseInfoId         int64      `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
-	Number                  string     `gorm:"column:number" json:"number" form:"number"`
-	BatchNumber             string     `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	PatientId               int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	IsCheck                 int64      `gorm:"column:is_check" json:"is_check" form:"is_check"`
-	XtBaseDrug              XtBaseDrug `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	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"`
+	WarehouseInfoId         int64               `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	Number                  string              `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string              `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PatientId               int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	IsCheck                 int64               `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	XtBaseDrug              XtBaseDrug          `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" `
+	XtDrugWarehouseInfo     XtDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"`
 }
 
 func (SgjDrugWarehouseOutInfo) TableName() string {

models/stock_models.go

@@ -106,12 +106,26 @@ type StWarehousingInfo struct {
 	LicenseNumber         string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
 	StorehouseId          int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId int64   `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	WarehousingTime       string  `json:"warehousing_time"`
 }
 
 func (StWarehousingInfo) TableName() string {
 	return "xt_warehouse_info"
 }
 
+type XtWarehouse struct {
+	ID               int64  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingOrder string `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	OperationTime    int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	OrgId            int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Status           int64  `gorm:"column:status" json:"status" form:"status"`
+	WarehousingTime  int64  `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
+}
+
+func (XtWarehouse) TableName() string {
+	return "xt_warehouse"
+}
+
 type WarehousingInfo struct {
 	ID                        int64       `gorm:"column:id" json:"id"`
 	WarehousingId             int64       `gorm:"column:warehousing_id" json:"warehousing_id"`
@@ -542,6 +556,7 @@ type WarehouseOutInfoOne struct {
 	BuyPrice                    float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	StockCount                  string  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 	RegisterNumber              string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	WarehouseOutTime            int64   `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
 }
 
 type WarehouseOutInfoTwo struct {

service/drug_stock_service.go

@@ -273,6 +273,6 @@ func GetDrugOutOrderInfoPrintList(startime int64, endtime int64, orgid int64) (l
 	if orgid > 0 {
 		db = db.Where("org_id = ?", orgid)
 	}
-	err = db.Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
+	err = db.Preload("XtDrugWarehouseInfo", "status=1 and org_id =?", orgid).Preload("XtBaseDrug", "status = 1 and org_id = ?", orgid).Find(&list).Error
 	return list, err
 }

service/gobal_config_service.go

@@ -366,10 +366,11 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
-	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status =1 and x.is_check = 1")
-	dbOne := XTReadDB().Table("xt_base_drug as b").Where("b.status =1")
-	dbTwo := XTReadDB().Table("xt_drug_warehouse_out as t").Where("t.status = 1")
-	fmt.Print(dbOne, dbTwo)
+	db := XTReadDB().Table("sgj_xt.xt_drug_warehouse_out_info as x").Where("x.status =1 and x.is_check = 1")
+	dbOne := XTReadDB().Table("sgj_xt.xt_base_drug as b").Where("b.status =1")
+	dbTwo := XTReadDB().Table("sgj_xt.xt_drug_warehouse_out as t").Where("t.status = 1")
+	dbThree := XTReadDB().Table("sgj_xt.xt_drug_warehouse_info as p").Where("p.status=1")
+	fmt.Print(dbOne, dbTwo, dbThree)
 	if startime > 0 {
 		db = db.Where("x.sys_record_time >=?", startime)
 	}
@@ -393,10 +394,11 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ?  or r.user_name like ?", likeKey, likeKey, likeKey)
 	}
 
+	db = db.Joins("left join sgj_xt.xt_drug_warehouse_info as p on p.id =x.warehouse_info_id")
 	if manufacturerId > 0 {
-		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.ctime,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.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		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.ctime,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.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	} else {
-		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.ctime,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.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		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.ctime,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.storehouse_id,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,b.last_price,t.creater,p.price").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	}
 
 	return outinfo, total, err

service/new_stock_service.go

@@ -119,7 +119,11 @@ func GetGoodStockList(orgId int64, storehouse_id int64, good_type int64, keyword
 		return db.Where("status = 1 and org_id = ? and is_check = 1", orgId)
 	})
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&good).Error
+	if orgId == 10489 {
+		err = db.Count(&total).Offset(offset).Limit(limit).Order("x.sum_count desc").Find(&good).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&good).Error
+	}
 
 	return good, total, err
 }

service/new_warehouse_service.go

@@ -51,9 +51,9 @@ func ConsumablesGoodDelivery(orgID int64, patient_id int64, record_time int64, g
 			return errThree
 		}
 
-		if orgID == 10265 {
-			UpdateGoodInfoByPrice(warehouse.GoodId, orgID, warehouse.Price, warehouse.PackingPrice)
-		}
+		//if orgID == 10265 {
+		//	UpdateGoodInfoByPrice(warehouse.GoodId, orgID, warehouse.Price, warehouse.PackingPrice)
+		//}
 
 		//更新his_prescripton_project出库状态值
 		UpdateHisPrescriptionProjectStatus(goods.GoodId, record_time, orgID, patient_id)
@@ -1268,7 +1268,7 @@ func BloodDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *
 }
 
 // 药品自动出库 递归方式
-func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64) (err error) {
+func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.HisDoctorAdviceInfo, hisprescribingNumber float64, unit string) (err error) {
 
 	drugError := models.XtDrugError{
 		UserOrgId:             orgID,
@@ -1304,7 +1304,10 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
-	if advice.PrescribingNumberUnit == drup.MaxUnit {
+	fmt.Println("总数量", countone)
+	fmt.Println("单位1", unit)
+	fmt.Println("单位2", drup.MaxUnit)
+	if unit == drup.MaxUnit {
 		deliver_number_one = countone * drup.MinNumber
 
 	} else {
@@ -1312,8 +1315,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
-	fmt.Println(deliver_number_one)
-
 	if advice.PrescribingNumberUnit == drup.MaxUnit {
 		drug_price = drup.RetailPrice
 	}
@@ -1389,6 +1390,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 	}
 
+	fmt.Println("库存数量2嚄噢嚄噢噢哦哦嚄噢嚄o", stock_number)
+	fmt.Println("出库数咯哦我我我我嚄嚄嚄嚄", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -1567,7 +1570,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 					PrescribingNumberUnit: advice.PrescribingNumberUnit,
 				}
 				CreateDrugError(drugError)
-				return errOne
 			}
 		}
 		if lastDrugOutInfo.ID > 0 {
@@ -1577,35 +1579,6 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 			AddSigleDrugWarehouseOutInfo(warehouseOutInfo)
 
-			//var his_count int64
-			//if lastDrugOutInfo.CountUnit == drup.MaxUnit {
-			//	his_count = lastDrugOutInfo.Count * drup.MinNumber
-			//}
-			//if lastDrugOutInfo.CountUnit == drup.MinUnit {
-			//	his_count = lastDrugOutInfo.Count
-			//}
-			//fmt.Println("deliver_number", deliver_number)
-			//fmt.Println("his_countwowowoowow", his_count)
-			//if deliver_number != his_count {
-			//	errThree := UpdateSigleDrugWarehouseOutInfo(lastDrugOutInfo.ID, warehouseOutInfo)
-			//	if errThree != nil {
-			//		drugError := models.XtDrugError{
-			//			UserOrgId:             orgID,
-			//			DrugId:                advice.DrugId,
-			//			RecordDate:            advice.AdviceDate,
-			//			PatientId:             advice.PatientId,
-			//			Remark:                "更新出库单失败",
-			//			Status:                1,
-			//			Ctime:                 time.Now().Unix(),
-			//			Mtime:                 0,
-			//			SumCount:              0,
-			//			Prescribingnumber:     advice.PrescribingNumber,
-			//			PrescribingNumberUnit: advice.PrescribingNumberUnit,
-			//		}
-			//		CreateDrugError(drugError)
-			//		return errThree
-			//	}
-			//}
 		}
 
 		var out_count int64
@@ -1622,8 +1595,13 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
+		fmt.Println("总出口数量", deliver_number_one)
+		fmt.Println("出库数量", out_count)
+		fmt.Println("退款数来的发阿道夫", cancel_count)
+
+		fmt.Println("查收嗖嗖嗖哦", deliver_number_one-(out_count-cancel_count))
 		if deliver_number_one-(out_count-cancel_count) >= 0 {
-			if (deliver_number - out_count - cancel_count) != 0 {
+			if (deliver_number_one - out_count - cancel_count) != 0 {
 				drugflow := models.DrugFlow{
 					WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseout.ID,
@@ -1947,6 +1925,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			StockMinNumber:    0,
 			BatchNumber:       warehouse.BatchNumber,
 			MaxUnit:           warehouse.MaxUnit,
+			MinUnit:           drup.MinUnit,
 			WarehousingInfoId: warehouse.WarehousingInfoId,
 			SupplyWarehouseId: warehouse.SupplyWarehouseId,
 			StorehouseId:      storeConfig.DrugStorehouseOut,
@@ -2140,6 +2119,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			cancel_count += item.Count
 		}
 
+		fmt.Println("deliver_nbumbwowowoowowow", deliver_number)
+		fmt.Println("out_coutnwoowowowowowow", out_count)
 		//如果本次出库数据大于历史出库数据 新增1条流水
 		if deliver_number > (out_count - cancel_count) {
 
@@ -2372,7 +2353,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		advice.PrescribingNumber = float64(prescribingNumber_two_temp)
 		advice.PrescribingNumberUnit = drup.MinUnit
 
-		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber)
+		BloodHisDrugDeliverInfo(orgID, overPlusNumber, warehouseout, drup, advice, hisprescribingNumber, unit)
 	}
 
 	return

service/patient_schedule_template_service.go

@@ -890,12 +890,13 @@ func SavePatientScheduleTemplateMode4To3(templateMode *models.PatientScheduleTem
 }
 
 type SchTemplatePatient struct {
-	ID         int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Name       string `gorm:"column:name" json:"name" form:"name"`
-	Lapseto    int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
-	Status     int64  `gorm:"column:status" json:"status" form:"status"`
-	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	Lapseto      int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	DialysisNo   string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	IsInfectious int64  `gorm:"column:is_infectious" json:"is_infectious"`
 }
 
 func (SchTemplatePatient) TableName() string {

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -302,7 +302,10 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 
 	db := p_service.XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status = 1")
 	table := p_service.XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
+
+	tableOne := p_service.XTReadDB().Table("xt_warehouse_info as p").Where("p.status = 1")
 	fmt.Println(table)
+	fmt.Println("tableOne", tableOne)
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
@@ -312,7 +315,7 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 	if endtime > 0 {
 		db = db.Where("x.sys_record_time<=?", endtime)
 	}
-	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price,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
+	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price,t.manufacturer,t.dealer,p.price").Joins("left join xt_warehouse_info as p on p.id =x.warehouse_info_id").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
 	return out, err
 }
 

service/self_drug_service.go

@@ -1850,10 +1850,6 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 		db = db.Preload("DrugWarehouseInfo", "org_id = ? and status = 1 and is_check = 1", orgId)
 	}
 
-	//if len(goodIds) > 0 {
-	//	db = db.Where("id in(?)", goodIds)
-	//}
-
 	if len(keyword) > 0 {
 		db = db.Where("drug_name like ? or manufacturer in(?)", likeKey, ids)
 	}
@@ -1861,19 +1857,36 @@ func GetDrugStockCountList(orgId int64, storehouse_id int64, good_type int64, ke
 	if orgId > 0 {
 		db = db.Where("x.org_id = ?", orgId)
 	}
-	err = db.Preload("XtDrugStockCount", func(db *gorm.DB) *gorm.DB {
-		if storehouse_id > 0 {
-			db = db.Where("storehouse_id = ?", storehouse_id)
-		}
-		return db.Where("status = 1 and user_org_id = ?", orgId)
 
-	}).Preload("DrugStockCount", func(db *gorm.DB) *gorm.DB {
-		if storehouse_id > 0 {
-			db = db.Where("storehouse_id = ?", storehouse_id)
-		}
-		return db.Where("status = 1 and user_org_id = ?", orgId).Group("drug_id,storehouse_id")
+	if orgId == 10489 {
+		err = db.Preload("XtDrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId)
+
+		}).Preload("DrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId).Group("drug_id,storehouse_id")
+
+		}).Count(&total).Offset(offset).Limit(limit).Order("x.sum_count desc").Find(&drug).Error
+	} else {
+		err = db.Preload("XtDrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId)
 
-	}).Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&drug).Error
+		}).Preload("DrugStockCount", func(db *gorm.DB) *gorm.DB {
+			if storehouse_id > 0 {
+				db = db.Where("storehouse_id = ?", storehouse_id)
+			}
+			return db.Where("status = 1 and user_org_id = ?", orgId).Group("drug_id,storehouse_id")
+
+		}).Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Find(&drug).Error
+	}
 
 	return drug, total, err
 }
@@ -1904,6 +1917,7 @@ func GetDrugWarehouseOutInfoByIdList(good_id int64, limit int64, page int64, org
 func GetAllGoodListSeven(orgid int64) (good []*models.GoodInfoSeven, err error) {
 
 	err = XTReadDB().Where("org_id = ? and status = 1", orgid).Find(&good).Error
+
 	return good, err
 }
 

service/stock_service.go

@@ -4422,7 +4422,8 @@ func GetExprotStockListTwenty(orgid int64, orderid []string, startime int64, end
 	if storehouse_id > 0 {
 		db = db.Where("x.storehouse_id = ?", storehouse_id)
 	}
-	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
+
+	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name,p.warehousing_time").Joins("left join xt_warehouse as p on p.id =x.warehousing_id").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
 
 	return info, err
 }
@@ -4450,7 +4451,8 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 
 	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status =1 ")
 	table := XTReadDB().Table("xt_good_information as t").Where("t.status = 1")
-	fmt.Println(table)
+	tableOne := XTReadDB().Table("xt_warehouse_out as p").Where("p.status=1")
+	fmt.Println(table, tableOne)
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
@@ -4465,7 +4467,7 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 		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,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,x.manufacturer,x.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_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.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,x.manufacturer,x.dealer,p.warehouse_out_time").Joins("left join xt_warehouse_out as p on p.id =x.warehouse_out_id").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
 	return out, err
 
 }
@@ -4889,11 +4891,14 @@ func ExportDrugList(warehouse_out_id []string) (out []*models.StDrugWarehouseInf
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status =1")
 
 	table := XTReadDB().Table("xt_base_drug as b").Where("b.status = 1")
+
+	tableOne := XTReadDB().Table("xt_drug_warehouse as p")
 	fmt.Println("table", table)
+	fmt.Println("tableOne", tableOne)
 	if len(warehouse_out_id) > 0 {
 		db = db.Where("x.warehousing_id in(?)", warehouse_out_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.dealer,x.manufacturer,x.warehousing_order,x.batch_number,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
+	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.dealer,x.manufacturer,x.warehousing_order,x.batch_number,b.dose,b.dose_unit,b.min_number,b.min_unit,b.max_unit,b.drug_name,b.drug_type,p.warehousing_time").Joins("left join xt_drug_warehouse as p on p.id =x.warehousing_id").Joins("left join xt_base_drug as b on b.id = x.drug_id").Scan(&out).Error
 	return out, err
 }
 

service/warhouse_service.go

@@ -619,7 +619,7 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
 
-			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber)
+			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice, prescribingNumber, advice.PrescribingNumberUnit)
 
 		} else {
 			return errors.New("药品信息不存在")