11月9日库存管理

controllers/dialysis_api_controller.go

@@ -81,6 +81,8 @@ func DialysisApiRegistRouters() {
 	beego.Router("/api/patient/savedialysissetting", &DialysisApiController{}, "Get:SaveDialysisSetting")
 
 	beego.Router("/api/patient/getdialysissetting", &DialysisApiController{}, "Get:GetDialysisSetting")
+
+	beego.Router("/api/patient/getdialysisparameter", &DialysisApiController{}, "Get:GetDialysisParameterList")
 }
 
 func (c *DialysisApiController) GetQueueCall() {
@@ -4375,3 +4377,37 @@ func (this *DialysisApiController) GetDialysisSetting() {
 	})
 	return
 }
+
+func (this *DialysisApiController) GetDialysisParameterList() {
+
+	keyword := this.GetString("keywords")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	partition_id, _ := this.GetInt64("partition_id")
+
+	schedule_type, _ := this.GetInt64("schedule_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)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, total, err := service.GetDialysisParameterList(keyword, limit, page, partition_id, schedule_type, startTime.Unix(), orgId)
+
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+		return
+
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+}

controllers/self_drug_api_congtroller.go

@@ -2737,29 +2737,6 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	keyword := this.GetString("keyword")
 	page, _ := this.GetInt64("page")
 	limit, _ := this.GetInt64("limit")
-	//start_time := this.GetString("start_time")
-	//end_time := this.GetString("end_time")
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	//var startTime int64
-	//if len(start_time) > 0 {
-	//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	//	if err != nil {
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	startTime = theTime.Unix()
-	//}
-	//var endTime int64
-	//if len(end_time) > 0 {
-	//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	endTime = theTime.Unix()
-	//}
 
 	// 查询该机构所有耗材入库信息
 	goodList, _ := service.GetAllGoodListSeven(orgId)
@@ -2774,18 +2751,6 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 		service.UpdateGoodInformation(it.ID, orgId, sum_total)
 	}
 
-	//查询删除的耗材数据
-	//listOne, _ := service.GetHisPrescriptionProjectByOrgId(orgId)
-	//for _, item := range listOne {
-	// //查询流水
-	// flowDetail, _ := service.GetPatientStockFlow(item.PatientId, item.RecordDate, item.ProjectId)
-	// formatInt, _ := strconv.ParseInt(item.Count, 10, 64)
-	// vmFlow := models.VmStockFlow{
-	//   Count:  formatInt,
-	// }
-	// service.ModifyPatientStockFlow(flowDetail.ID,vmFlow)
-	//}
-
 	var ids []int64
 	var goodIds []int64
 	manufacturerList, _ := service.GetManufacturerListByKeyword(orgId, keyword)
@@ -2796,41 +2761,8 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	for _, it := range infoList {
 		goodIds = append(goodIds, it.GoodId)
 	}
-	//list, _, err := service.GetGoodNewQuery(orgId, storehouse_id, good_type, keyword, page, limit, ids, goodIds, startTime, endTime)
 
 	stockList, total, err := service.GetGoodStockList(orgId, storehouse_id, good_type, keyword, page, limit, ids)
-	//for _,item :=range list{
-	// //查询入库信息分组
-	//  warehouseInfo, _ := service.FindGoodWarehouseInfoGroup(item.ID, orgId, storehouse_id, startTime, endTime)
-	//  for _,it :=range warehouseInfo {
-	//    item.WarehousingInfo = append(item.WarehousingInfo, it)
-	//  }
-	//  //查询入库信息
-	//  info, _ := service.FindGoodWarehouseInfo(item.ID, orgId, storehouse_id, startTime, endTime)
-	//  for _,it :=range info {
-	//    item.StWarehousingInfo = append(item.StWarehousingInfo, it)
-	//  }
-	//  //出库数据
-	//  outInfo, _ := service.FindGoodWarehouseOutInfo(item.ID, orgId, storehouse_id, startTime, endTime)
-	//  for _,it :=range outInfo {
-	//    item.WarehouseOutInfo = append(item.WarehouseOutInfo, it)
-	//  }
-	//  //出库流水
-	//  outFlow, _ := service.FindGoodStockOutFlow(item.ID, item.OrgId, storehouse_id, startTime, endTime)
-	//  for _,it :=range outFlow {
-	//    item.FlowOutInfo = append(item.FlowOutInfo, it)
-	//  }
-	//  //退库流水
-	//  cancelFlow, _ := service.FindGoodCancelFlow(item.ID, item.OrgId, storehouse_id, startTime, endTime)
-	//  for _,it :=range cancelFlow {
-	//    item.FlowCancelInfo = append(item.FlowCancelInfo, it)
-	//  }
-	//  //退库数据
-	//  cancelInfo, _ := service.FindCancelStockInfo(item.ID, orgId, storehouse_id, startTime, endTime)
-	//  for _,it :=range cancelInfo {
-	//    item.CancelStockInfo = append(item.CancelStockInfo, it)
-	//  }
-	//}
 
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDataException, "获取查询信息失败")
@@ -2838,8 +2770,7 @@ func (this *SelfDrugApiController) GetGoodNewQuery() {
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"total": total,
-		//"list":  list,
+		"total":     total,
 		"stockList": stockList,
 	})
 }
@@ -3470,12 +3401,14 @@ func (this *SelfDrugApiController) GetDrugNewQuery() {
 	for _, it := range drug {
 		var sum_count int64
 		var limit_count int64
-
+		fmt.Println("it233323323232323223", it.DrugName)
 		drugInfo, _ := service.GetDrugWarehouseInfoName(it.ID, orgId)
 		for _, item := range drugInfo {
+
 			sum_count += item.StockMaxNumber*it.MinNumber + item.StockMinNumber
 		}
-		limit_count = it.DrugStockLimitCount * it.MinNumber
+		stockInt, _ := strconv.ParseInt(it.DrugStockLimit, 10, 64)
+		limit_count = stockInt * it.MinNumber
 		service.UpdateDrugById(it.ID, orgId, limit_count, sum_count)
 	}
 

controllers/supply_order_api_contorller.go

@@ -2403,8 +2403,29 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 			sum_in_count += item.WarehousingCount
 		}
 		service.UpdateGoodByGoodId(item.GoodId, sum_count, sum_in_count, item.OrgId)
-		//增加入库数量
-		service.AddGoodSumInCount(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId, item.WarehousingCount)
+		fmt.Println("入库数量23333333333333333333333wo", item.WarehousingCount)
+		//查询是否有该耗材
+		goodStock, _ := service.GetGoodSumCount(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId)
+		if goodStock.ID > 0 {
+			//增加入库数量
+			service.AddGoodSumInCount(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId, item.WarehousingCount)
+		}
+		if goodStock.ID == 0 {
+			stock := models.XtGoodStockCount{
+				UserOrgId:        item.OrgId,
+				GoodId:           item.GoodId,
+				StorehouseId:     storeConfig.StorehouseOutInfo,
+				Status:           1,
+				Ctime:            time.Now().Unix(),
+				Mtime:            0,
+				StockInCount:     item.WarehousingCount,
+				StockOutCount:    0,
+				StockCancelCount: 0,
+				FlushCount:       sum_count,
+				StockActOutCount: 0,
+			}
+			service.CreateGoodStockCount(stock)
+		}
 
 		//更新剩余库存
 		service.UpdateGoodFlushCount(storeConfig.StorehouseOutInfo, item.GoodId, item.OrgId, sum_count)
@@ -2447,8 +2468,9 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 		list, _ := service.GetDrugSumCountByStorehouseId(houseConfig.DrugStorehouseOut, items.OrgId, items.DrugId)
 		var sum_count int64
 		var sum_in_count int64
+		var sum_waresing_count int64
+		baseDrug, _ := service.GetBaseDrugMedical(items.DrugId)
 		for _, it := range list {
-			baseDrug, _ := service.GetBaseDrugMedical(it.DrugId)
 			if it.MaxUnit == baseDrug.MaxUnit {
 				it.StockMaxNumber = it.StockMaxNumber * baseDrug.MinNumber
 				it.WarehousingCount = it.WarehousingCount * baseDrug.MinNumber
@@ -2456,10 +2478,39 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 			sum_count += it.StockMaxNumber + it.StockMinNumber
 			sum_in_count += it.WarehousingCount
 		}
+		if items.MaxUnit == baseDrug.MaxUnit {
+			sum_waresing_count = items.WarehousingCount * baseDrug.MinNumber
+		}
+		if items.MaxUnit == baseDrug.MinUnit {
+			sum_waresing_count = items.WarehousingCount
+		}
+
 		service.UpdateMedicalSumCount(items.DrugId, sum_count, sum_in_count, items.OrgId)
 
-		//更新入库数量和剩余库存
-		service.UpdateDrugCount(houseConfig.DrugStorehouseOut, items.OrgId, items.DrugId, sum_in_count, sum_count)
+		//查询是否有
+		drugStock, _ := service.GetDrugStockCountSix(houseConfig.DrugStorehouseOut, items.DrugId, items.OrgId)
+		fmt.Println("drugStockwoowowowowoowowowo", drugStock.ID)
+		if drugStock.ID == 0 {
+			drug := models.XtDrugStockCount{
+				UserOrgId:      items.OrgId,
+				StorehouseId:   houseConfig.DrugStorehouseOut,
+				SumInCount:     sum_waresing_count,
+				SumOutCount:    0,
+				SumCancelCount: 0,
+				DrugId:         items.DrugId,
+				Ctime:          time.Now().Unix(),
+				Mtime:          0,
+				Status:         1,
+				FlushCount:     sum_count,
+				SumActOutCount: 0,
+			}
+			service.CreateDrugStock(drug)
+		}
+		if drugStock.ID > 0 {
+			//更新入库数量和剩余库存
+			service.UpdateDrugCount(houseConfig.DrugStorehouseOut, items.OrgId, items.DrugId, sum_in_count, sum_count)
+		}
+
 	}
 	fmt.Println(errs)
 	for _, items := range drugFlow {
@@ -3830,7 +3881,7 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 
 				//更改库存
 				err := service.UpdateWarehousingInfoById(item.ProjectId, item.SupplyWarehouseDetailInfo, info)
-
+				fmt.Println("更改库存3232323223322332")
 				service.ModifyGoodAddInformation(item.ProjectId, item.SupplyCount, item.UserOrgId)
 
 				//扣减出库数量

models/drug.go

@@ -218,14 +218,14 @@ func (BaseDrugLibNight) TableName() string {
 }
 
 type BaseDrugLibTwenty struct {
-	ID                  int64  `gorm:"column:id" json:"id" form:"id"`
-	DrugName            string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
-	Status              int64  `gorm:"column:status" json:"status" form:"status"`
-	OrgId               int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	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"`
-	DrugStockLimitCount int64  `gorm:"column:drug_stock_limit_count" json:"drug_stock_limit_count" form:"drug_stock_limit_count"`
+	ID             int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName       string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Status         int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId          int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	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"`
+	DrugStockLimit string `gorm:"column:drug_stock_limit" json:"drug_stock_limit_count" form:"drug_stock_limit"`
 }
 
 func (BaseDrugLibTwenty) TableName() string {

models/schedule_models.go

@@ -290,22 +290,24 @@ func (VmBloodPatients) TableName() string {
 }
 
 type VmBloodSchedule 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"`
-	PartitionId      int64                      `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
-	BedId            int64                      `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	PatientId        int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	ScheduleDate     int64                      `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
-	ScheduleType     int64                      `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	ScheduleWeek     int64                      `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
-	ModeId           int64                      `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
-	Status           int64                      `gorm:"column:status" json:"status" form:"status"`
-	CreatedTime      int64                      `gorm:"column:created_time" json:"created_time" form:"created_time"`
-	UpdatedTime      int64                      `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
-	IsExport         int64                      `gorm:"column:is_export" json:"is_export" form:"is_export"`
-	DeviceNumber     *NewMDeviceNumberVM        `gorm:"ForeignKey:BedId" json:"device_number"`
-	SchedualPatient  *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
-	DialysisSolution DialysisSolution           `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
+	ID                         int64                      `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64                      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PartitionId                int64                      `gorm:"column:partition_id" json:"partition_id" form:"partition_id"`
+	BedId                      int64                      `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	PatientId                  int64                      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ScheduleDate               int64                      `gorm:"column:schedule_date" json:"schedule_date" form:"schedule_date"`
+	ScheduleType               int64                      `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	ScheduleWeek               int64                      `gorm:"column:schedule_week" json:"schedule_week" form:"schedule_week"`
+	ModeId                     int64                      `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Status                     int64                      `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                int64                      `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                int64                      `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	IsExport                   int64                      `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	DeviceNumber               *NewMDeviceNumberVM        `gorm:"ForeignKey:BedId" json:"device_number"`
+	SchedualPatient            *NewMSchedualPatientVMList `gorm:"ForeignKey:PatientId" json:"patient"`
+	DialysisSolution           DialysisSolution           `gorm:"ForeignKey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId" json:"dialysis_solution"`
+	DialysisPrescription       DialysisPrescription       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,RecordDate" json:"dialysis_prescription"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `gorm:"ForeignKey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,AssessmentDate" json:"assessment_befor_dislysis"`
 }
 
 func (VmBloodSchedule) TableName() string {

service/dialysis_solution_service.go

@@ -128,3 +128,38 @@ func GetDialysisSetting(orgid int64) (models.XtDialysisSetting, error) {
 	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&setting).Error
 	return setting, err
 }
+
+func GetDialysisParameterList(keywords string, limit int64, page int64, partition_id int64, schedule_type int64, scheduleDate int64, orgID int64) (schedule []*models.VmBloodSchedule, total int64, err error) {
+	db := XTReadDB().Model(&models.VmBloodSchedule{}).Where("status = 1")
+	offset := (page - 1) * limit
+	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)
+	}
+
+	if len(keywords) > 0 {
+		keywords = "%" + keywords + "%"
+		db = db.Joins("JOIN xt_patients AS patient ON patient.id=xt_schedule.patient_id AND patient.status = 1 AND patient.user_org_id = ? AND patient.name Like ?", orgID, keywords)
+		err = db.Count(&total).Offset(offset).Limit(limit).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("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	} else {
+		err = db.Count(&total).Offset(offset).Limit(limit).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("XtAssessmentBeforeDislysis", "status = 1 AND user_org_id = ? and assessment_date = ?", orgID, scheduleDate).
+			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).Find(&schedule).Error
+	}
+
+	return schedule, total, err
+}

service/new_stock_service.go

@@ -211,6 +211,13 @@ func GetDrugStockCount(storehouse_id int64, drug_id int64, org_id int64) (*model
 	return &drugStockCount, nil
 }
 
+func GetDrugStockCountSix(storehouse_id int64, drug_id int64, org_id int64) (models.XtDrugStockCount, error) {
+
+	drugStockCount := models.XtDrugStockCount{}
+	err = XTReadDB().Where("storehouse_id = ? and drug_id = ? and user_org_id  = ? and status = 1", storehouse_id, drug_id, org_id).Find(&drugStockCount).Error
+	return drugStockCount, err
+}
+
 func CreateDrugStockSum(drug models.XtDrugStockCount) error {
 
 	ut := XTWriteDB().Begin()

service/stock_service.go

@@ -7893,6 +7893,19 @@ func GetGoodDialysisOutInfo(orgid int64, patient_id int64, sys_record_time int64
 	return detail, err
 }
 
+func GetGoodSumCount(storehouse_id int64, good_id int64, orgid int64) (models.XtGoodStockCount, error) {
+
+	stock := models.XtGoodStockCount{}
+	err := XTReadDB().Where("storehouse_id = ? and good_id = ? and user_org_id = ? and status = 1", storehouse_id, good_id, orgid).Find(&stock).Error
+	return stock, err
+}
+
+func CreateGoodStockCount(stock models.XtGoodStockCount) error {
+
+	err := XTWriteDB().Create(&stock).Error
+	return err
+}
+
 func AddGoodSumInCount(storehouse_id int64, good_id int64, user_org_id int64, count int64) error {
 
 	ut := XTWriteDB().Begin()
@@ -7931,6 +7944,12 @@ func UpdateGoodFlushCount(storehouse_id int64, good_id int64, user_org_id int64,
 	return err
 }
 
+func CreateDrugStock(stock models.XtDrugStockCount) error {
+
+	err := XTWriteDB().Create(&stock).Error
+	return err
+}
+
 func UpdateDrugCount(storehouse_id int64, user_org_id int64, drug_id int64, sum_in_count int64, flush_count int64) error {
 
 	ut := XTWriteDB().Begin()