Merge branch '20211122' of http://git.shengws.com/csx/XT_New into 20211122

controllers/schedule_api_controller.go

@@ -68,6 +68,7 @@ func ScheduleApiRegistRouters() {
 	beego.Router("/api/order/getdataprint", &ScheduleApiController{}, "Get:GetDataPrint")
 	beego.Router("/api/schedule/getnextweekpanels", &ScheduleApiController{}, "Get:GetNextWeekPanels")
 	beego.Router("/api/schedule/synchroschedule", &ScheduleApiController{}, "Get:SynchroSchedule")
+	beego.Router("/api/schedule/getpatientscheduletemplate", &ScheduleApiController{}, "Get:GetPatientScheduleTempalate")
 }
 
 func (c *ScheduleApiController) GetWeekPanels() {
@@ -1959,6 +1960,7 @@ func (c *ScheduleApiController) GetInitExcelInitDate() {
 		theDay := thisTime2.AddDate(0, 0, index)
 		days = append(days, theDay.Format("2006-01-02"))
 	}
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days": days,
 	})
@@ -2746,65 +2748,140 @@ func (c *ScheduleApiController) SynchroSchedule() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	//根据模板ID获取模板数据
 	list, _ := service.GetTemplateListByTemplateId(template_id, orgId)
-	//清空该时间段的所有排班数据
-	service.DeletePatientSchedule(copy_startime, copy_endtime, orgId)
 
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	nowtime := recordDate.Unix()
+	fmt.Println("今日时间", nowtime)
+	fmt.Println("后期日期", copy_startime)
 	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
+	//如果选择的开始日期大于当前日期
+	if copy_startime > nowtime {
+		//清空该时间段的所有排班数据
+		service.DeletePatientSchedule(copy_startime, copy_endtime, orgId)
 
-	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
+		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
 		}
 
-		//根据床位号获取区号
-		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)
+		}
 	}
+	//如果选择的日期小于当前日期，只同步今日以后的数据
+	if copy_startime <= nowtime {
+		//清空今日以后的数据
+		service.DeletePatientScheduleToday(nowtime, 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
+			}
 
-	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,
+			//根据床位号获取区号
+			number, _ := service.GetBedNumberById(item.DeviceNumberID, orgId)
+			item.ZoneId = number.ZoneID
+		}
+
+		for _, item := range list {
+			// 同步今日以后的数据
+			if item.ScheduleDate > nowtime {
+				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)
+			}
 		}
 
-		service.CreatePatientSchedule(&schedule)
 	}
 
 	returnData := make(map[string]interface{}, 0)
@@ -2812,3 +2889,12 @@ func (c *ScheduleApiController) SynchroSchedule() {
 	c.ServeSuccessJSON(returnData)
 	return
 }
+
+func (c *ScheduleApiController) GetPatientScheduleTempalate() {
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	tempalate, _ := service.GetPatientScheduleTempalate(orgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"schedule": tempalate,
+	})
+}

models/self_drug_models.go

@@ -568,6 +568,7 @@ type BloodDrugWarehouseOutInfo struct {
 	MinNumber               int64   `json:"min_number"`
 	Dose                    float64 `json:"dose"`
 	DoseUnit                string  `json:"dose_unit"`
+	LastPrice               float64 `json:"last_price"`
 }
 
 type XtMonitorConfig struct {

models/stock_models.go

@@ -1084,6 +1084,7 @@ type SgjWarehouseOutInfo struct {
 	PackingUnit             string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 	PackingPrice            float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	BuyPrice                float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 }
 
 type SgjCancelStockInfo struct {

service/gobal_config_service.go

@@ -351,9 +351,9 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_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.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,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,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.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,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
 	} else {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_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.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,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,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.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,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
 	}
 
 	return outinfo, total, err

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -285,7 +285,7 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 	if endtime > 0 {
 		db = db.Where("x.ctime<=?", endtime)
 	}
-	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price").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,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price").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/schedule_service.go

@@ -1022,6 +1022,13 @@ func DeletePatientSchedule(startime int64, endtime int64, org_id int64) (models.
 	return schedule, err
 }
 
+func DeletePatientScheduleToday(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{}
@@ -1037,3 +1044,10 @@ func CreatePatientSchedule(schedule *models.XtSchedule) error {
 	utx.Commit()
 	return err
 }
+
+func GetPatientScheduleTempalate(orgid int64) (models.PatientScheduleTemplateMode, error) {
+
+	mode := models.PatientScheduleTemplateMode{}
+	err := XTReadDB().Where("org_id = ? and status =1", orgid).Find(&mode).Error
+	return mode, err
+}