11月8日库存管理

controllers/dialysis_api_controller.go

@@ -2810,6 +2810,10 @@ func (c *DialysisApiController) GetDialysisOrder() {
 		dialysis_count, _ := service.GetDialysisOrderCount(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 		patientInfo.TotalDialysis = dialysis_count
 	}
+	if adminUserInfo.CurrentOrgId == 10101 {
+		dialysis_count, _ := service.GetDialysisOrderCountOne(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+		patientInfo.TotalDialysis = dialysis_count
+	}
 
 	//相关操作对应的操作人
 	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)

controllers/qiniiu_api_controller.go

@@ -22,7 +22,7 @@ func (c *QiNiuApiController) GetQNUpToken() {
 	defer redisClient.Close()
 
 	token, err := redisClient.Get("qn_token").Result()
-	fmt.Print("token------------------------------------", token)
+
 	if err != nil {
 		defer fmt.Println(err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGetQiniuUpToken)

controllers/schedule_api_controller.go

@@ -67,6 +67,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/order/changefuncprint", &ScheduleApiController{}, "Get:ChangeFuncPrint")
 	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
 	beego.Router("/api/schedule/getnextweekpanels", &ScheduleApiController{}, "Get:GetNextWeekPanels")
+	beego.Router("/api/schedule/synchroschedule", &ScheduleApiController{}, "Get:SynchroSchedule")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -367,7 +368,9 @@ func (c *ScheduleApiController) CreateSchedule() {
 	}
 
 	redis := service.RedisClient()
+
 	err = service.CreateSchedule(&schedule)
+
 	key := "scheduals_" + scheduleDate + "_" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10)
 
 	redis.Set(key, "", time.Second)
@@ -1400,6 +1403,8 @@ func (this *ScheduleApiController) ExportSchedule() {
 			//err := service.UpdateScheduleStatus(clear_schedule_date, this.GetAdminUserInfo().CurrentOrgId)
 			if err == nil {
 				for _, item := range schedules {
+					//删除当天的日期排班
+					service.DeleteScheduleExist(item.ScheduleDate, item.UserOrgId)
 					//查找当天日期是否存在
 					_, errcode := service.GetTodayScheduleIsExist(item.PatientId, item.ScheduleDate, item.UserOrgId, item.ModeId, item.ScheduleType)
 					if errcode == gorm.ErrRecordNotFound {
@@ -2731,3 +2736,79 @@ func (c *ScheduleApiController) GetNextWeekPanels() {
 		"schedule": schedule,
 	})
 }
+
+func (c *ScheduleApiController) SynchroSchedule() {
+
+	template_id, _ := c.GetInt64("template_id")
+	copy_startime, _ := c.GetInt64("copy_startime")
+	copy_endtime, _ := c.GetInt64("copy_endtime")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	//根据模板ID获取模板数据
+	list, _ := service.GetTemplateListByTemplateId(template_id, orgId)
+	//清空该时间段的所有排班数据
+	service.DeletePatientSchedule(copy_startime, copy_endtime, orgId)
+
+	var tuesday int64
+	var wednesday int64
+	var thursday int64
+	var friday int64
+	var saturday int64
+
+	tuesday = copy_startime + 86400
+	wednesday = copy_startime + 172800
+	thursday = copy_startime + 259200
+	friday = copy_startime + 345600
+	saturday = copy_startime + 432000
+
+	for _, item := range list {
+		if item.Weekday == 1 {
+			item.ScheduleDate = copy_startime
+		}
+		if item.Weekday == 2 {
+			item.ScheduleDate = tuesday
+		}
+		if item.Weekday == 3 {
+			item.ScheduleDate = wednesday
+		}
+		if item.Weekday == 4 {
+			item.ScheduleDate = thursday
+		}
+		if item.Weekday == 5 {
+			item.ScheduleDate = friday
+		}
+		if item.Weekday == 6 {
+			item.ScheduleDate = saturday
+		}
+		if item.Weekday == 7 {
+			item.ScheduleDate = copy_endtime
+		}
+
+		//根据床位号获取区号
+		number, _ := service.GetBedNumberById(item.DeviceNumberID, orgId)
+		item.ZoneId = number.ZoneID
+	}
+
+	for _, item := range list {
+		schedule := models.XtSchedule{
+			UserOrgId:    orgId,
+			PartitionId:  item.ZoneId,
+			BedId:        item.DeviceNumberID,
+			PatientId:    item.PatientID,
+			ScheduleDate: item.ScheduleDate,
+			ScheduleType: item.TimeType,
+			ScheduleWeek: item.Weekday,
+			ModeId:       item.TreatMode,
+			Status:       1,
+			CreatedTime:  time.Now().Unix(),
+			UpdatedTime:  0,
+		}
+
+		service.CreatePatientSchedule(&schedule)
+	}
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["list"] = list
+	c.ServeSuccessJSON(returnData)
+	return
+}

controllers/schedule_template_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/astaxie/beego"
@@ -76,6 +77,8 @@ func (this *PatientScheduleTemplateAPIController) InitData() {
 	}
 
 	deviceNumbers, getDeviceNumbersErr := service.GetScheduleValidDeviceNumbers(adminUserInfo.CurrentOrgId)
+
+	fmt.Println("deviceNumbers233323232332232323223233223323232323", deviceNumbers)
 	if getDeviceNumbersErr != nil {
 		this.ErrorLog("获取床位号失败：%v", getDeviceNumbersErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

main.go

@@ -11,7 +11,7 @@ func init() {
 }
 
 func main() {
-	//service.BeginAutoCreateWeekSchedulesJob()
+	service.BeginAutoCreateWeekSchedulesJob()
 	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()

models/patient_schedule_template_models.go

@@ -44,3 +44,24 @@ type PatientScheduleTemplateItem struct {
 func (PatientScheduleTemplateItem) TableName() string {
 	return "xt_patient_schedule_template_item"
 }
+
+type VmPatientScheduleTemplateItem struct {
+	ID             int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgID          int64 `gorm:"column:org_id" json:"-" form:"org_id"`
+	TemplateID     int64 `gorm:"column:template_id" json:"template_id" form:"template_id"`
+	DeviceNumberID int64 `gorm:"column:device_number_id" json:"device_number_id" form:"device_number_id"`
+	PatientID      int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	TreatMode      int64 `gorm:"column:treat_mode" json:"treat_mode" form:"treat_mode"` // 治疗模式
+	Weekday        int64 `gorm:"column:weekday" json:"weekday" form:"weekday"`          // 周一-周日 1-7
+	TimeType       int64 `gorm:"column:time_type" json:"time_type" form:"time_type"`    // 上下晚 123
+	Status         int64 `gorm:"column:status" json:"-" form:"status"`
+	CreateTime     int64 `gorm:"column:ctime" json:"-" form:"ctime"`
+	ModifyTime     int64 `gorm:"column:mtime" json:"-" form:"mtime"`
+	IsExport       int64 `gorm:"column:is_export" json:"is_export" form:"is_export"`
+	ScheduleDate   int64
+	ZoneId         int64
+}
+
+func (VmPatientScheduleTemplateItem) TableName() string {
+	return "xt_patient_schedule_template_item"
+}

service/auto_create_week_schedules_service.go

@@ -147,6 +147,7 @@ func _refreshWeekSchedulesWithTemplateItems(tx *gorm.DB, orgID int64, week time.
 
 	// 批量插入排班
 	if len(templateItems) > 0 {
+
 		valueStrs := make([]string, 0, len(templateItems))
 		values := make([]interface{}, 0, len(templateItems)*11)
 		for _, item := range templateItems {

service/mobile_dialysis_service.go

@@ -2534,6 +2534,11 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 	return
 }
 
+func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = readDb.Model(&models.DialysisOrder{}).Where("dialysis_date>=1640966400 and  dialysis_date <= 1672416000 AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", orgID, patient_id).Count(&count).Error
+	return
+}
+
 func GetFirstDateOfMonth(d time.Time) time.Time {
 	d = d.AddDate(0, 0, -d.Day()+1)
 	return GetZeroTime(d)

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -57,9 +57,13 @@ func GetSchedules(orgID int64, schIDs []string) ([]*ScheduleVM, error) {
 		return nil, err
 	}
 	for _, item := range schedules {
-		dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
-		fmt.Println(dialysis_count)
+
 		if orgID != 10101 {
+			dialysis_count, _ := GetDialysisOrderCount(orgID, item.PatientID, item.ScheduleDate)
+			item.Patient.TotalDialysis = dialysis_count
+		}
+		if orgID == 10101 {
+			dialysis_count, _ := GetDialysisOrderCountOne(orgID, item.PatientID, item.ScheduleDate)
 			item.Patient.TotalDialysis = dialysis_count
 		}
 
@@ -203,6 +207,11 @@ func GetDialysisOrderCount(orgID int64, patient_id int64, recordDate int64) (cou
 	return
 }
 
+func GetDialysisOrderCountOne(orgID int64, patient_id int64, recordDate int64) (count int64, err error) {
+	err = p_service.XTReadDB().Model(&models.DialysisOrder{}).Where("dialysis_date >=1640966400 and dialysis_date <= 1672416000 AND status = 1 AND stage = 2 AND user_org_id = ? AND patient_id = ?", orgID, patient_id).Count(&count).Error
+	return
+}
+
 func GetOutStockTotalCountTwo(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
 	err = p_service.XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.record_time,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >= ? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error

service/schedule_service.go

@@ -161,7 +161,16 @@ func GetPointSchedule(orgID, scheduleDate, scheduleWeek, scheduleType, bedId int
 }
 
 func CreateSchedule(m *models.Schedule) error {
-	return writeDb.Model(&models.Schedule{}).Create(&m).Error
+	utx := XTWriteDB().Begin()
+	err := utx.Create(&m).Error
+	utx.Commit()
+	return err
+}
+
+func DeleteScheduleExist(scheduleData int64, user_org_id int64) (models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTWriteDB().Where("schedule_date= ? and user_org_id = ? and status = 1", scheduleData, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return schedule, err
 }
 
 func GetTodayScheduleIsExist(patientid int64, schedudate int64, orgid int64, mode_id int64, schedule_type int64) (*models.XtSchedule, error) {
@@ -193,7 +202,10 @@ func GetSchedule(orgID, id int64) (*models.Schedule, error) {
 }
 
 func UpdateSchedule(m *models.Schedule) error {
-	return writeDb.Model(&models.Schedule{}).Save(&m).Error
+	utx := XTWriteDB().Begin()
+	err := utx.Save(&m).Error
+	utx.Commit()
+	return err
 }
 
 func GetPatientScheduleFormToday(orgId, id, start int64) (schedules []*models.PatientSchedule, err error) {
@@ -996,3 +1008,32 @@ func GetNextWeekPanels(startime int64, endtime int64, orgid int64) (schedule []*
 	}).Find(&schedule).Error
 	return schedule, err
 }
+
+func GetTemplateListByTemplateId(id int64, orgid int64) (list []*models.VmPatientScheduleTemplateItem, err error) {
+
+	err = XTReadDB().Where("template_id =? and org_id = ? and status = 1", id, orgid).Find(&list).Error
+	return list, err
+}
+
+func DeletePatientSchedule(startime int64, endtime int64, org_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+	err := XTWriteDB().Model(&schedule).Where("schedule_date>=? and schedule_date<=? and user_org_id = ? and status = 1", startime, endtime, org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return schedule, err
+}
+
+func GetBedNumberById(id int64, org_id int64) (models.DeviceNumber, error) {
+
+	number := models.DeviceNumber{}
+
+	err := XTReadDB().Where("id = ? and status = 1 and org_id =?", id, org_id).Find(&number).Error
+	return number, err
+}
+
+func CreatePatientSchedule(schedule *models.XtSchedule) error {
+
+	utx := XTWriteDB().Begin()
+	err := utx.Create(&schedule).Error
+	utx.Commit()
+	return err
+}

service/stock_service.go

@@ -1380,7 +1380,12 @@ func FindAllWarehouseOutListOne(orgId int64, page int64, limit int64, startTime
 	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.ctime desc").Find(&list).Error
+	if orgId == 10191 {
+		err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.warehouse_out_time desc").Find(&list).Error
+	} else {
+		err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.ctime desc").Find(&list).Error
+	}
+
 	return list, total, err
 
 }
@@ -1429,7 +1434,12 @@ func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startT
 	}
 	db = db.Count(&total)
 	offset := (page - 1) * limit
-	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.ctime desc").Find(&list).Error
+	if orgId == 10191 {
+		err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.warehouse_out_time desc").Find(&list).Error
+	} else {
+		err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.ctime desc").Find(&list).Error
+	}
+
 	return list, total, err
 
 }