11月9日库存管理

controllers/dialysis_api_controller.go

@@ -83,6 +83,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/getdialysissetting", &DialysisApiController{}, "Get:GetDialysisSetting")
 
 	beego.Router("/api/patient/getdialysisparameter", &DialysisApiController{}, "Get:GetDialysisParameterList")
+
+	beego.Router("/api/patient/getdialysisgoodtotalcount", &DialysisApiController{}, "Get:GetDialysisGoodTotalCount")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -4411,3 +4413,29 @@ func (this *DialysisApiController) GetDialysisParameterList() {
 		return
 	}
 }
+
+func (this *DialysisApiController) GetDialysisGoodTotalCount() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	schedule_type, _ := this.GetInt64("schedule_type")
+
+	partion_type, _ := this.GetInt64("partion_type")
+
+	start_time := this.GetString("schedule_date")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+
+	list, err := service.GetDialysisGoodTotalCount(orgId, schedule_type, partion_type, startTime.Unix())
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/doctors_api_controller.go

@@ -199,7 +199,7 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 func (c *DoctorsApiController) GetAllDoctorAndNurse() {
 
 	adminUserInfo := c.GetAdminUserInfo()
-	doctors, nursers, _ := service.GetAllDoctorAndNurse(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
+	doctors, nursers, _ := service.GetAllDoctorAndNurseSix(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"doctors": doctors,

controllers/drug_stock_api_contorller.go

@@ -3623,10 +3623,14 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 				baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
 				if it.MaxUnit == baseDrug.MaxUnit {
 					it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
+					it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
 				}
+			}
+			for _, it := range drugInfolist {
 				total_count += it.WarehousingCount
-				over_count += it.StockMaxNumber*baseDrug.MinNumber + it.StockMinNumber
+				over_count += it.StockMaxNumber + it.StockMinNumber
 			}
+			fmt.Println("over_countwoowoowowow", over_count)
 			//查询该仓库是否有默认数据
 			_, errcode := service.GetDrugStockCount(item.StorehouseId, item.DrugId, item.OrgId)
 			if errcode == gorm.ErrRecordNotFound {
@@ -3722,6 +3726,11 @@ func (c *StockDrugApiController) ReturnCheckWarehouseingInfo() {
 		}
 		drugInfolist, _ := service.GetDrugSumCountByStorehouseId(item.StorehouseId, item.OrgId, item.DrugId)
 		var over_count int64 //剩余库存
+		for _, it := range drugInfolist {
+			if it.MaxUnit == medical.MaxUnit {
+				it.StockMaxNumber = it.StockMaxNumber * medical.MinNumber
+			}
+		}
 		for _, it := range drugInfolist {
 			over_count += it.StockMaxNumber*medical.MinNumber + it.StockMinNumber
 		}

controllers/his_api_controller.go

@@ -2670,6 +2670,8 @@ func (c *HisApiController) DeletePrescription() {
 						//更新库存
 						service.UpdateSumGood(c.GetAdminUserInfo().CurrentOrgId, houseConfig.StorehouseOutInfo, item.ProjectId, flush_count)
 
+						//更新基础库库存
+						service.UpdateGoodInfoSumCountSix(item.ProjectId, flush_count, c.GetAdminUserInfo().CurrentOrgId)
 						//查询今日该耗材退库数量
 						//cancelInfoOne, _ := service.GetCancelStockInfoByPatientId(info.PatientId, item.ProjectId, info.SysRecordTime)
 						//var cancel_Count int64
@@ -3061,6 +3063,7 @@ func (c *HisApiController) DeleteProject() {
 
 				//更新剩余库存
 				service.UpdateSumGood(adminInfo.CurrentOrgId, houseConfig.StorehouseOutInfo, project.ProjectId, over_count)
+
 				//查询今日该患者开了多少耗材
 				//projectList, _ := service.GetHisPrepscritionByPatientId(info.PatientId, project.ProjectId, info.SysRecordTime)
 				//

models/new_stock_models.go

@@ -177,3 +177,218 @@ type XtDialysisSetting struct {
 func (XtDialysisSetting) TableName() string {
 	return "xt_dialysis_setting"
 }
+
+type VmStockFlowTwenty struct {
+	ID                  int64           `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId       int64           `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodId              int64           `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count               int64           `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId           int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId           int64           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime          int64           `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType      int64           `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys               int64           `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	Price               float64         `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId int64           `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	BuyPrice            float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	IsRead              int64           `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	OverCount           int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	Ctime               int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	WarehousingInfo     WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"xt_warehouse_info"`
+}
+
+func (VmStockFlowTwenty) TableName() string {
+	return "xt_stock_flow"
+}
+
+type GoodInfoTwenty struct {
+	ID                     int64                   `gorm:"column:id" json:"id" form:"id"`
+	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"`
+	BuyPrice               float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	Manufacturer           int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Status                 int64                   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                  int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName               string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	RetailPrice            float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	Ctime                  int64                   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	PackingUnit            string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice           float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	StWarehousingInfo      []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	WarehousingInfoOne     []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
+	WarehousingInfoStart   []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
+	WarehousingInfoEnd     []*StartWarehousingInfo `gorm:"json:"warehouse_info_end"`
+	WarehouseOutInfoEnd    []*VmStockFlowTwenty
+	WarehouseOutInfoStart  []*VmStockFlowTwenty
+	WarehouseInfoEnd       []*VmStockFlowTwenty //期末入库量
+	StartFlowWarehouseInfo []*VmStockFlowTwenty //本期增加
+	//期初结余
+	StartFlowInfo    []*VmStockFlowTwenty
+	StartOutFlowInfo []*VmStockFlowTwenty
+	//期末结余
+	EndFlowInfo    []*VmStockFlowTwenty
+	EndFlowOutInfo []*VmStockFlowTwenty
+	//期初退库
+	StartCancelFlowInfo []*VmStockFlowTwenty
+	//期末退库
+	EndCancelFLowInfo []*VmStockFlowTwenty
+
+	StartEndCancelFLowInfo []*VmStockFlowTwenty
+
+	WareStartStockInventoryProfit []*VmStockFlowTwenty //期初盘盈
+	WareStartStockInventoryLosses []*VmStockFlowTwenty //期初盘亏
+
+	WareEndStockInventoryProfit []*VmStockFlowTwenty //期末盘盈
+	WareEndStockInventoryLosses []*VmStockFlowTwenty //期末盘亏
+
+	WareStartEndStockInventoryProfit []*VmStockFlowTwenty //期间盘盈
+	WareStartEndStockInventoryLosses []*VmStockFlowTwenty //期间盘亏
+}
+
+func (GoodInfoTwenty) TableName() string {
+	return "xt_good_information"
+}
+
+type CancelStockInfoTwenty struct {
+	ID              int64   `gorm:"column:id" json:"id"`
+	GoodId          int64   `gorm:"column:good_id" json:"good_id"`
+	Count           int64   `gorm:"column:count" json:"count"`
+	Price           float64 `gorm:"column:price" json:"price"`
+	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"`
+	Number          string  `gorm:"column:number" json:"number" form:"number"`
+	WarehouseInfoId int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PatientId       int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	RecordDate      int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IsCheck         int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+}
+
+func (CancelStockInfoTwenty) TableName() string {
+	return "xt_cancel_stock_info"
+}
+
+type WarehouseOutInfoTwenty 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"`
+	Count            int64           `gorm:"column:count" json:"count"`
+	Price            float64         `gorm:"column:price" json:"price"`
+	TotalPrice       float64         `gorm:"column:total_price" json:"total_price"`
+	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"`
+	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"`
+	ConsumableType   int64           `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	ProjectId        int64           `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	StorehouseId     int64           `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	BuyPrice         float64         `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	StockCount       string          `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	IsCheck          int64           `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	WarehousingInfo  WarehousingInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfotId" `
+	OverCount        int64           `gorm:"column:over_count" json:"over_count" form:"over_count"`
+}
+
+func (WarehouseOutInfoTwenty) TableName() string {
+	return "xt_warehouse_out_info"
+}
+
+type WarehousingInfoTwenty 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"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	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"`
+	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"`
+	StockCount       int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	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"`
+	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	IsCheck          int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+}
+
+func (WarehousingInfoTwenty) TableName() string {
+	return "xt_warehouse_info"
+}
+
+type VmBaseDrugTwenty struct {
+	ID                               int64             `gorm:"column:id" json:"id" form:"id"`
+	DrugType                         int64             `gorm:"column:drug_type" json:"drug_type" form:"drug_type"`
+	DrugName                         string            `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit                          string            `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinNumber                        int64             `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	MinUnit                          string            `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Dose                             string            `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit                         string            `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	RetailPrice                      float64           `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MinPrice                         float64           `gorm:"column:min_price" json:"min_price" form:"min_price"`
+	LastPrice                        float64           `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	Manufacturer                     int64             `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Status                           int64             `gorm:"column:status" json:"status" form:"status"`
+	Ctime                            int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                            int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId                            int64             `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugFlowWarehouseInfo            []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_flow_info"`
+	DrugActFlowWarehouseInfo         []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_act_flow_info"`
+	DrugWarehouseInfoStart           []*DrugFlowTwenty //期初入库结余
+	DrugWarehouseOutInfoStart        []*DrugFlowTwenty //期初出库结余
+	DrugWarehouseOutInfoEnd          []*DrugFlowTwenty //期末出库结余
+	DrugWarehouseInfoEnd             []*DrugFlowTwenty //期末入库结余
+	DrugWarehouseInfoStartEnd        []*DrugFlowTwenty //期中增加
+	DrugWarehouseOutInfoStartEnd     []*DrugFlowTwenty //  期中减少
+	WareStartStockInventoryProfit    []*DrugFlowTwenty //期初盘盈
+	WareStartStockInventoryLosses    []*DrugFlowTwenty //期初盘亏
+	WareEndStockInventoryProfit      []*DrugFlowTwenty //期末盘盈
+	WareEndStockInventoryLosses      []*DrugFlowTwenty //期末盘亏
+	WareStartEndStockInventoryProfit []*DrugFlowTwenty //期间盘盈
+	WareStartEndStockInventoryLosses []*DrugFlowTwenty //期间盘亏
+	WareStartStockCancelInfo         []*DrugFlowTwenty //期初结余退库
+	WareEndStockCancelInfo           []*DrugFlowTwenty //期末结余退库
+	WareStartEndStockCancelInfo      []*DrugFlowTwenty //期中减少退库
+
+}
+
+func (VmBaseDrugTwenty) TableName() string {
+	return "xt_base_drug"
+}
+
+type DrugFlowTwenty struct {
+	ID                     int64                  `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId          int64                  `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                 int64                  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Count                  int64                  `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId              int64                  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId              int64                  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime             int64                  `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType         int64                  `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	Manufacturer           int64                  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Status                 int64                  `gorm:"column:status" json:"status" form:"status"`
+	Ctime                  int64                  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                  int64                  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                  float64                `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId    int64                  `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId   int64                  `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId      int64                  `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	MaxUnit                string                 `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                string                 `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StorehouseId           int64                  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	DrugWarehouseInfoOne   DrugWarehouseInfo      `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId"json:"xt_drug_warehouse_info" `
+	IsRead                 int64                  `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	IsCheck                int64                  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	XtDrugWarehouseOutInfo XtDrugWarehouseOutInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseOutDetailId"json:"xt_drug_warehouse_out_info" `
+}
+
+func (DrugFlowTwenty) TableName() string {
+	return "xt_drug_flow"
+}

service/dialysis_solution_service.go

@@ -163,3 +163,28 @@ func GetDialysisParameterList(keywords string, limit int64, page int64, partitio
 
 	return schedule, total, err
 }
+
+func GetDialysisGoodTotalCount(orgID int64, schedule_type int64, partition_id int64, scheduleDate int64) (schedule []*models.VmBloodSchedule, err error) {
+
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+
+	if scheduleDate > 0 {
+		db = db.Where("schedule_date = ?", scheduleDate)
+	}
+	if schedule_type > 0 {
+		db = db.Where("schedule_type = ?", schedule_type)
+	}
+	if partition_id > 0 {
+		db = db.Where("partition_id = ?", partition_id)
+	}
+	if orgID > 0 {
+		db = db.Where("user_org_id  = ?", orgID)
+	}
+	err = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+		Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+		Preload("DialysisPrescription", "status = 1 AND user_org_id = ? and record_date = ?", orgID, scheduleDate).
+		Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+
+	return schedule, err
+
+}

service/self_drug_service.go

@@ -1582,7 +1582,7 @@ func GetGoodExpiryDateQuery(storehouse_id int64, expiry_type int64, keyword stri
 	return info, total, err
 }
 
-func GetGoodPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfo, total int64, err error) {
+func GetGoodPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, ids []int64, goodIds []int64) (goodinfo []*models.GoodInfoTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&goodinfo).Where("status = 1 and total_count > 0")
 	offset := (page - 1) * limit
@@ -1675,7 +1675,7 @@ func GetDrugExpiryDateQuery(storehouse_id int64, expiry_type int64, keyword stri
 	return info, total, err
 }
 
-func GetDrugPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrug, total int64, err error) {
+func GetDrugPurchaseStockQuery(good_type int64, keyword string, page int64, limit int64, orgid int64, startime int64, endtime int64, ids []int64, infos []int64) (druginfo []*models.VmBaseDrugTwenty, total int64, err error) {
 
 	db := XTReadDB().Model(&druginfo).Where("status = 1")
 	offset := (page - 1) * limit
@@ -1993,7 +1993,7 @@ func GetAddGoodWarehouseInfoList(good_id int64, orgid int64, startime int64, end
 	return info, err
 }
 
-func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.VmStockFlow, err error) {
+func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1 and consumable_type =1")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2011,7 +2011,7 @@ func GetAddStartFlow(good_id int64, orgid int64, startime int64, endtime int64)
 	return info, err
 }
 
-func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlow, err error) {
+func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2029,7 +2029,7 @@ func GetReduceWarehouseInfoList(good_id int64, orgid int64, startime int64, endt
 	return outinfo, err
 }
 
-func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlow, err error) {
+func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 7)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2047,7 +2047,7 @@ func GetStartEndCancelFLowInfo(good_id int64, orgid int64, startime int64, endti
 	return outinfo, err
 }
 
-func FindeStartFlowInfo(good_id int64, orgid int64, startime int64) (info []*models.VmStockFlow, err error) {
+func FindeStartFlowInfo(good_id int64, orgid int64, startime int64) (info []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and consumable_type = 1")
 	if good_id > 0 {
@@ -2063,7 +2063,7 @@ func FindeStartFlowInfo(good_id int64, orgid int64, startime int64) (info []*mod
 	return info, err
 }
 
-func FindeStartFlowOutInfo(good_id int64, orgid int64, startime int64) (info []*models.VmStockFlow, err error) {
+func FindeStartFlowOutInfo(good_id int64, orgid int64, startime int64) (info []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and  (consumable_type = 2 or consumable_type = 3)")
 	if good_id > 0 {
@@ -2079,7 +2079,7 @@ func FindeStartFlowOutInfo(good_id int64, orgid int64, startime int64) (info []*
 	return info, err
 }
 
-func FindeStartCancelInfo(good_id int64, orgid int64, startime int64) (info []*models.VmStockFlow, err error) {
+func FindeStartCancelInfo(good_id int64, orgid int64, startime int64) (info []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1 and  (consumable_type = 4 or consumable_type = 7)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2094,7 +2094,7 @@ func FindeStartCancelInfo(good_id int64, orgid int64, startime int64) (info []*m
 	return info, err
 }
 
-func FindEndStartFlowInfo(good_id int64, orgid int64, endtime int64) (info []*models.VmStockFlow, err error) {
+func FindEndStartFlowInfo(good_id int64, orgid int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and consumable_type = 1")
 	if good_id > 0 {
@@ -2110,7 +2110,7 @@ func FindEndStartFlowInfo(good_id int64, orgid int64, endtime int64) (info []*mo
 	return info, err
 }
 
-func FindeEndFLowOutInfo(good_id int64, orgid int64, endtime int64) (info []*models.VmStockFlow, err error) {
+func FindeEndFLowOutInfo(good_id int64, orgid int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and  (consumable_type = 2 or consumable_type = 3)")
 	if good_id > 0 {
@@ -2126,7 +2126,7 @@ func FindeEndFLowOutInfo(good_id int64, orgid int64, endtime int64) (info []*mod
 	return info, err
 }
 
-func FindEndCancelInfo(good_id int64, orgid int64, endtime int64) (info []*models.VmStockFlow, err error) {
+func FindEndCancelInfo(good_id int64, orgid int64, endtime int64) (info []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and  (consumable_type = 4 or consumable_type = 7)")
 	if good_id > 0 {
@@ -2142,7 +2142,7 @@ func FindEndCancelInfo(good_id int64, orgid int64, endtime int64) (info []*model
 	return info, err
 }
 
-func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlow, err error) {
+func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 2 or consumable_type = 3)")
 	if good_id > 0 {
@@ -2158,7 +2158,7 @@ func FindeWarehouseOutInfo(good_id int64, orgid int64, startime int64) (outinfo
 	return outinfo, err
 }
 
-func FindeStartStockInventoryProfit(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlow, err error) {
+func FindeStartStockInventoryProfit(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 10)")
 	if good_id > 0 {
@@ -2174,7 +2174,7 @@ func FindeStartStockInventoryProfit(good_id int64, orgid int64, startime int64)
 	return outinfo, err
 }
 
-func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlow, err error) {
+func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 10)")
 	if good_id > 0 {
@@ -2193,7 +2193,7 @@ func FindeEndStokInventoryProfit(good_id int64, orgid int64, startime int64, end
 	return outinfo, err
 }
 
-func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlow, err error) {
+func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, endtime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
 	if good_id > 0 {
 		db = db.Where("good_id = ?", good_id)
@@ -2211,7 +2211,7 @@ func FindeEndStockInventoryLosses(good_id int64, orgid int64, startime int64, en
 	return outinfo, err
 }
 
-func FindStartStockInventoryLosses(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlow, err error) {
+func FindStartStockInventoryLosses(good_id int64, orgid int64, startime int64) (outinfo []*models.VmStockFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&outinfo).Where("status = 1 and (consumable_type = 11)")
 	if good_id > 0 {
@@ -2227,7 +2227,7 @@ func FindStartStockInventoryLosses(good_id int64, orgid int64, startime int64) (
 	return outinfo, err
 }
 
-func GetDrugWarehouseInfoStart(drug_id int64, orgid int64, startTime int64) (info []*models.DrugFlow, err error) {
+func GetDrugWarehouseInfoStart(drug_id int64, orgid int64, startTime int64) (info []*models.DrugFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and  consumable_type=1 ")
 	if drug_id > 0 {
@@ -2243,7 +2243,7 @@ func GetDrugWarehouseInfoStart(drug_id int64, orgid int64, startTime int64) (inf
 	return info, err
 }
 
-func DrugWarehouseInfoEnd(drug_id int64, orgid int64, endTime int64) (info []*models.DrugFlow, err error) {
+func DrugWarehouseInfoEnd(drug_id int64, orgid int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and consumable_type = 1")
 	if drug_id > 0 {
@@ -2259,7 +2259,7 @@ func DrugWarehouseInfoEnd(drug_id int64, orgid int64, endTime int64) (info []*mo
 	return info, err
 }
 
-func DrugWarehouseOutInfoEnd(drug_id int64, orgid int64, endTime int64) (info []*models.DrugFlow, err error) {
+func DrugWarehouseOutInfoEnd(drug_id int64, orgid int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type = 2 or consumable_type= 3)")
 	if drug_id > 0 {
@@ -2275,7 +2275,7 @@ func DrugWarehouseOutInfoEnd(drug_id int64, orgid int64, endTime int64) (info []
 	return info, err
 }
 
-func GetEndDrugFlowCancelInfo(drug_id int64, orgid int64, endTime int64) (info []*models.DrugFlow, err error) {
+func GetEndDrugFlowCancelInfo(drug_id int64, orgid int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1 and (consumable_type = 4 or consumable_type= 7)")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2290,7 +2290,7 @@ func GetEndDrugFlowCancelInfo(drug_id int64, orgid int64, endTime int64) (info [
 	return info, err
 }
 
-func GetDrugWarehouseStartEnd(drug_id int64, orgid int64, startTime int64, endTime int64) (info []*models.DrugFlow, err error) {
+func GetDrugWarehouseStartEnd(drug_id int64, orgid int64, startTime int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1 and  consumable_type = 1")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2308,7 +2308,7 @@ func GetDrugWarehouseStartEnd(drug_id int64, orgid int64, startTime int64, endTi
 	return info, err
 }
 
-func FindeDrugWarehouseOutInfo(drug_id int64, orgid int64, startTime int64, endTime int64) (info []*models.DrugFlow, err error) {
+func FindeDrugWarehouseOutInfo(drug_id int64, orgid int64, startTime int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1  and (consumable_type = 2 or consumable_type= 3)")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2326,7 +2326,7 @@ func FindeDrugWarehouseOutInfo(drug_id int64, orgid int64, startTime int64, endT
 	return info, err
 }
 
-func FindStartEndDrugWarehouseOutInfo(drug_id int64, orgid int64, startTime int64, endTime int64) (info []*models.DrugFlow, err error) {
+func FindStartEndDrugWarehouseOutInfo(drug_id int64, orgid int64, startTime int64, endTime int64) (info []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&info).Where("status = 1  and (consumable_type= 7)")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2396,7 +2396,7 @@ func GetDrugFlowSart(drug_id int64, user_org_id int64, ctime int64) (flow []*mod
 	return flow, err
 }
 
-func GetDrugFlowOut(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowOut(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status = 1  and (consumable_type = 2 or consumable_type= 3)")
 	if drug_id > 0 {
@@ -2412,7 +2412,7 @@ func GetDrugFlowOut(drug_id int64, user_org_id int64, ctime int64) (flow []*mode
 	return flow, err
 }
 
-func GetStartDrugFlowCancelInfo(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlow, err error) {
+func GetStartDrugFlowCancelInfo(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status = 1  and (consumable_type = 4 or consumable_type = 7)")
 
@@ -2429,7 +2429,7 @@ func GetStartDrugFlowCancelInfo(drug_id int64, user_org_id int64, ctime int64) (
 	return flow, err
 }
 
-func GetDrugFlowStartProfit(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowStartProfit(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&flow).Where("status = 1  and consumable_type = 10")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2444,7 +2444,7 @@ func GetDrugFlowStartProfit(drug_id int64, user_org_id int64, ctime int64) (flow
 	return flow, err
 }
 
-func GetDrugFlowStartLosses(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowStartLosses(drug_id int64, user_org_id int64, ctime int64) (flow []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&flow).Where("status = 1  and consumable_type = 11 ")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2459,7 +2459,7 @@ func GetDrugFlowStartLosses(drug_id int64, user_org_id int64, ctime int64) (flow
 	return flow, err
 }
 
-func GetDrugFlowEndProfit(drug_id int64, user_org_id int64, endtime int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowEndProfit(drug_id int64, user_org_id int64, endtime int64) (flow []*models.DrugFlowTwenty, err error) {
 
 	db := XTReadDB().Model(&flow).Where("status = 1 and consumable_type = 10")
 	if drug_id > 0 {
@@ -2475,7 +2475,7 @@ func GetDrugFlowEndProfit(drug_id int64, user_org_id int64, endtime int64) (flow
 	return flow, err
 }
 
-func GetDrugFlowEndLosses(drug_id int64, user_org_id int64, endtime int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowEndLosses(drug_id int64, user_org_id int64, endtime int64) (flow []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&flow).Where("status = 1  and consumable_type = 11")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2490,7 +2490,7 @@ func GetDrugFlowEndLosses(drug_id int64, user_org_id int64, endtime int64) (flow
 	return flow, err
 }
 
-func GetDrugFlowStartEndProfit(drug_id int64, user_org_id int64, startime int64, endtime int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowStartEndProfit(drug_id int64, user_org_id int64, startime int64, endtime int64) (flow []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&flow).Where("status = 1  and consumable_type = 10 ")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)
@@ -2508,7 +2508,7 @@ func GetDrugFlowStartEndProfit(drug_id int64, user_org_id int64, startime int64,
 	return flow, err
 }
 
-func GetDrugFlowStartEndLosses(drug_id int64, user_org_id int64, startime int64, endtime int64) (flow []*models.DrugFlow, err error) {
+func GetDrugFlowStartEndLosses(drug_id int64, user_org_id int64, startime int64, endtime int64) (flow []*models.DrugFlowTwenty, err error) {
 	db := XTReadDB().Model(&flow).Where("status = 1  and consumable_type = 11 ")
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)

service/user_service.go

@@ -48,6 +48,26 @@ func GetAllDoctorAndNurse(orgId, appid int64) (doctors []AdminUserList, nurses [
 	return
 }
 
+func GetAllDoctorAndNurseSix(orgId, appid int64) (doctors []AdminUserList, nurses []AdminUserList, err error) {
+
+	var users []AdminUserList
+	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("org_id=? and app_id =? and uar.user_type IN (2,3) and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&users).Error
+	if err != nil {
+		return
+	}
+	if len(users) == 0 {
+		return
+	}
+	for _, item := range users {
+		if item.UserType == 2 {
+			doctors = append(doctors, item)
+		} else {
+			nurses = append(nurses, item)
+		}
+	}
+	return
+}
+
 func GetAllAdminUsers(orgId, appid int64) (list []*AdminUserList, err error) {
 
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=? and uar.app_id =? and ua.status=1", orgId, appid).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error