11月8日库存管理

controllers/self_drug_api_congtroller.go

@@ -83,6 +83,8 @@ func SelfDrugRouters() {
 	beego.Router("/api/drug/saveinentorylist", &SelfDrugApiController{}, "Post:SaveInventoryList")
 
 	beego.Router("/api/drug/getdamagebydrugid", &SelfDrugApiController{}, "Get:GetDamageByDrugId")
+
+	beego.Router("/api/drug/getinventorymodelist", &SelfDrugApiController{}, "Get:GetInventoryModeList")
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -2607,3 +2609,20 @@ func (this *SelfDrugApiController) GetDamageByDrugId() {
 		"list": list,
 	})
 }
+
+func (this *SelfDrugApiController) GetInventoryModeList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, err := service.GetInventoryModeList(orgId)
+	manufacturerList, err := service.GetAllManufacturerList(orgId)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "更新设备失败")
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+	})
+}

models/device_models.go

@@ -140,15 +140,16 @@ func (DeviceGroup) TableName() string {
 }
 
 type DeviceNumber struct {
-	ID         int64  `gorm:"column:id" json:"id"`
-	OrgID      int64  `gorm:"column:org_id" json:"-"`
-	Number     string `gorm:"column:number" json:"number"`
-	GroupID    int64  `gorm:"column:group_id" json:"group_id"`
-	ZoneID     int64  `gorm:"column:zone_id" json:"zone_id"`
-	Status     int8   `json:"-"`
-	CreateTime int64  `gorm:"column:ctime" json:"-"`
-	ModifyTime int64  `gorm:"column:mtime" json:"-"`
-	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	ID         int64      `gorm:"column:id" json:"id"`
+	OrgID      int64      `gorm:"column:org_id" json:"-"`
+	Number     string     `gorm:"column:number" json:"number"`
+	GroupID    int64      `gorm:"column:group_id" json:"group_id"`
+	ZoneID     int64      `gorm:"column:zone_id" json:"zone_id"`
+	Status     int8       `json:"-"`
+	CreateTime int64      `gorm:"column:ctime" json:"-"`
+	ModifyTime int64      `gorm:"column:mtime" json:"-"`
+	Sort       int64      `gorm:"column:sort" json:"sort" form:"sort"`
+	DeviceZone DeviceZone `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:ZoneID;"`
 }
 
 func (DeviceNumber) TableName() string {

models/schedule_models.go

@@ -190,14 +190,13 @@ type VmSchedulesRemind struct {
 
 	DeviceZone                 DeviceZone                 `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
 	DeviceNumber               DeviceNumber               `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
-	DialysisOrder              DialysisOrder              `json:"order" gorm:"foreignkey:DialysisDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DialysisOrder              DialysisOrder              `json:"order" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 	XtPatients                 XtPatients                 `json:"patient" gorm:"foreignkey:ID;AssociationForeignKey:PatientId;"`
-	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
+	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisPrescription       DialysisPrescription       `json:"prescription" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId;"`
+	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
 }
 
 func (VmSchedulesRemind) TableName() string {
@@ -225,7 +224,6 @@ type WeekScheduleSix struct {
 	DialysisPrescription       DialysisSolution           `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DoctorAdvice               []*DoctorAdvice            `json:"doctoradvice" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
 	HisDoctorAdviceInfo        []*HisDoctorAdviceInfo     `json:"hisdoctoradviceinfo" gorm:"foreignkey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId;"`
-	Solution                   []*DialysisSolution        `json:"solution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	DialysisSolution           DialysisSolution           `json:"dialysissolution" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
 	XtAssessmentBeforeDislysis XtAssessmentBeforeDislysis `json:"assessmentbefor" gorm:"foreignkey:PatientId,AssessmentDate;AssociationForeignKey:PatientId,ScheduleDate"`
 }

models/self_drug_models.go

@@ -936,3 +936,21 @@ type SgjDrugWarehouseOutInfo struct {
 func (SgjDrugWarehouseOutInfo) TableName() string {
 	return "xt_drug_warehouse_out_info"
 }
+
+type PatientDrugWarehouseInfo struct {
+	DrugId         int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number         string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate    int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate     int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	StockMaxNumber int64   `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber int64   `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	BatchNumber    string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	DrugName       string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	MaxUnit        string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit        string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MinNumber      int64   `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose           float64 `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit       string  `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	Manufacturer   int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer         int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+}

service/doctor_schedule_service.go

@@ -648,8 +648,9 @@ func GetSearchPatient(keywords string, orgid int64, startime int64) (schedule []
 
 	likeKey := "%" + keywords + "%"
 	db := XTReadDB().Table("xt_schedule as s")
-	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", "status= 1").
-		Preload("DialysisOrder", "status =1").
+	err = db.Preload("DeviceZone", " status= 1").Preload("DeviceNumber", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1").Preload("DeviceZone", "status = 1")
+	}).Preload("DialysisOrder", "status =1").
 		Joins("JOIN xt_patients as p ON p.id = s.patient_id And(p.name LIKE ? OR p.dialysis_no LIKE ?)", likeKey, likeKey).Where("s.user_org_id = ? and s.schedule_date = ? and s.status =1", orgid, startime).
 		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id,p.name as patient").Find(&schedule).Error
 	return schedule, err

service/schedule_service.go

@@ -605,12 +605,10 @@ func GetWeekDayScheduleByIdThee(orgid int64, scheduleDate int64, scheduleType in
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date =?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("patient_id,mode_id").Order("id asc")
 	}).Find(&list).Error
 
 	return list, err
@@ -632,12 +630,10 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 		db = db.Where("x.partition_id in (?)", zone)
 	}
 
-	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("XtAssessmentBeforeDislysis", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
-	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
+	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1 and dialysis_date =?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status =1 and parent_id = 0 and advice_date = ?", scheduleDate).Preload("ChildDoctorAdvice", "status = 1")
+	}).Preload("HisDoctorAdviceInfo", "status = 1 and advice_date = ?", scheduleDate).Preload("DialysisPrescription", "status = 1 and record_date = ?", scheduleDate).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Group("patient_id,mode_id").Order("id desc")
 	}).Find(&list).Error
 
 	return list, err
@@ -824,8 +820,6 @@ func GetNextWeekDaySchedule(weektype int64, weektime int64, startime int64, endt
 			return db.Where("status = 1").Order("id asc")
 		}).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1").Order("id asc")
-	}).Preload("Solution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Group("patient_id,mode_id").Order("id asc")
 	}).Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Joins("JOIN xt_patients as p ON p.id = s.patient_id").

service/self_drug_service.go

@@ -1144,3 +1144,15 @@ func GetDamageByDrugId(drugid int64, warhousingorder string, drugtype int64) (dr
 	err = db.Preload("XtBaseDrug", "status = 1").Find(&drug).Error
 	return drug, err
 }
+
+func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+	return info, err
+}