排班

controllers/his_hospital_api_controller.go

@@ -38,6 +38,8 @@ func HisHospitalManagerApiRegistRouters() {
 
 	beego.Router("/api/monthhospitaldetail/get", &HisHospitalApiController{}, "get:GetHisHospitalMonthDetailInfo")
 
+	beego.Router("/api/exportuncharge/get", &HisHospitalApiController{}, "get:GetExportHisHospitalUnChargeData")
+
 }
 func (c *HisHospitalApiController) RefundDetail() {
 	patient_id, _ := c.GetInt64("patient_id")
@@ -1056,3 +1058,29 @@ func (c *HisHospitalApiController) GetHisHospitalMonthDetailInfo() {
 		"his_info":            record,
 	})
 }
+
+func (c *HisHospitalApiController) GetExportHisHospitalUnChargeData() {
+	start_time_str := c.GetString("start_time")
+	end_time_str := c.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	adminInfo := c.GetAdminUserInfo()
+	theStartTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time_str+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordStartTime := theStartTime.Unix()
+	theEndTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time_str+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordEndTime := theEndTime.Unix()
+	//var prescriptions []*models.HisPrescription
+	var prescriptions []*models.ExportHisPrescription
+	prescriptions, _ = service.GetUnChargeHisHospitalPrescription(adminInfo.CurrentOrgId, recordStartTime, recordEndTime)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"month_prescriptions": prescriptions,
+	})
+}

controllers/schedule_api_controller.go

@@ -1260,6 +1260,10 @@ func (c *ScheduleApiController) GetSchedules() {
 	partition_id, _ := c.GetInt64("partition_id")
 	schedule_type, _ := c.GetInt64("schedule_type")
 
+	is_before, _ := c.GetInt64("is_before")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+
 	adminInfo := c.GetAdminUserInfo()
 
 	thisTime := time.Now()
@@ -1303,6 +1307,14 @@ func (c *ScheduleApiController) GetSchedules() {
 	theEndTime, _ := time.ParseInLocation(timeLayout, weekEndTime, loc)
 	weekStartPoint := theStarTime.Unix()
 	weekEndPoint := theEndTime.Unix()
+	if is_before > 0 {
+		timeLayout := "2006-01-02 15:04:05"
+		loc, _ := time.LoadLocation("Local")
+		theStarTime, _ := time.ParseInLocation(timeLayout, start_time, loc)
+		theEndTime, _ := time.ParseInLocation(timeLayout, end_time, loc)
+		weekStartPoint = theStarTime.Unix()
+		weekEndPoint = theEndTime.Unix()
+	}
 
 	schdules, _ := service.GetWeekScheduleOne(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, partition_id, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
@@ -4322,11 +4334,9 @@ func (c *ScheduleApiController) GetScheduleOne() {
 
 	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
 	patitionIdStr := c.GetString("patitionid")
-
 	ids := strings.Split(patitionIdStr, ",")
 	fmt.Println("patitonStr", ids)
 	schedule_type, _ := c.GetInt64("schedule_type")
-
 	adminInfo := c.GetAdminUserInfo()
 
 	thisTime := time.Now()
@@ -4372,7 +4382,6 @@ func (c *ScheduleApiController) GetScheduleOne() {
 	weekEndPoint := theEndTime.Unix()
 
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
-
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days":           days,

models/his_models.go

@@ -132,6 +132,7 @@ type HisPatient struct {
 	SickType               int64   `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PatientInfo            string  `gorm:"column:patient_info" json:"patient_info" form:"patient_info"`
 	InsuplcAdmdvs          string  `gorm:"column:insuplc_admdvs" json:"insuplc_admdvs" form:"insuplc_admdvs"`
+	Insutype               string  `gorm:"column:insutype" json:"insutype" form:"insutype"`
 }
 
 func (HisPatient) TableName() string {
@@ -2522,3 +2523,34 @@ type GoodHisPrescriptionProject struct {
 func (GoodHisPrescriptionProject) TableName() string {
 	return "his_prescription_project"
 }
+
+type ExportHisPrescription 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"`
+	RecordDate             int64                     `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PatientId              int64                     `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId           int64                     `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	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"`
+	Number                 string                    `gorm:"column:number" json:"number" form:"number"`
+	Type                   int64                     `gorm:"column:type" json:"type" form:"type"`
+	Doctor                 string                    `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	Creator                int64                     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modifier               int64                     `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	OrderStatus            int64                     `gorm:"column:order_status" json:"order_status" form:"order_status"`
+	PreTime                int64                     `gorm:"column:pre_time" json:"pre_time" form:"pre_time"`
+	BatchNumber            string                    `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	PrescriptionNumber     string                    `gorm:"column:prescription_number" json:"prescription_number" form:"prescription_number"`
+	Patients               Patients                  `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
+	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
+	Total                  string                    `gorm:"-" json:"total" form:"total"`
+	PType                  int64                     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	MedType                string                    `gorm:"column:med_type" json:"med_type" form:"med_type"`
+	IsMedicine             int64                     `gorm:"column:is_medicine" json:"is_medicine" form:"is_medicine"`
+}
+
+func (ExportHisPrescription) TableName() string {
+	return "his_prescription"
+}

models/schedule_models.go

@@ -59,6 +59,30 @@ func (Schedule) TableName() string {
 	return "xt_schedule"
 }
 
+type ScheduleTwo 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"`
+
+	Patient                   string               `gorm:"-" json:"patient" form:"patient"`
+	PatientInfectiousDiseases []InfectiousDiseases `json:"patient_contagions" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId;"`
+	DialysisMachineName       string               `gorm:"column:dialysis_machine_name" json:"dialysis_machine_name" form:"dialysis_machine_name"`
+}
+
+func (ScheduleTwo) TableName() string {
+	return "xt_schedule"
+}
+
 type SchedulePatients 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"`

service/his_hospital_service.go

@@ -565,3 +565,17 @@ func GetHisPrescriptionProjectByIDTwo(id int64) (projects models.HisPrescription
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("id = ? AND status = 1", id).First(&projects).Error
 	return
 }
+
+func GetUnChargeHisHospitalPrescription(org_id int64, start_time int64, end_time int64) (prescription []*models.ExportHisPrescription, err error) {
+	err = readDb.Model(&models.ExportHisPrescription{}).
+		Preload("Patients", "status = 1").
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisOrderInfo", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND  record_date <= ? AND record_date >= ?  AND  order_status =  4 AND p_type = 1", org_id, end_time, start_time).
+		Find(&prescription).Error
+	return
+}

service/his_print_service.go

@@ -18,18 +18,108 @@ func GetBatchDrugHisPrescription(ids []string, record_time int64, user_org_id in
 	return
 }
 
+type HisPrintPrescriptionProject struct {
+	ID                 int64      `gorm:"column:id" json:"id" form:"id"`
+	ProjectId          int64      `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Price              float64    `gorm:"column:price" json:"price" form:"price"`
+	UserOrgId          int64      `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	PatientId          int64      `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
+	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
+	Count              string     `gorm:"column:count" json:"count" form:"count"`
+	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
+	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
+	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	DeliveryWay        string     `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	ExecutionFrequency string     `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+	Day                string     `gorm:"column:day" json:"day" form:"day"`
+	HisProject         HisProject `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
+	GoodInfo           GoodInfo   `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
+	Remark             string     `gorm:"column:remark" json:"remark" form:"remark"`
+	Unit               string     `gorm:"column:unit" json:"unit" form:"unit"`
+	Type               int64      `gorm:"column:type" json:"type" form:"type"`
+	Doctor             int64      `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	ExecutionTime      int64      `gborm:"column:execution_time" json:"execution_time" form:"execution_time"`
+	ExecutionStaff     int64      `gorm:"column:execution_staff" json:"execution_staff" form:"execution_staff"`
+	ExecutionState     int64      `gorm:"column:execution_state" json:"execution_state" form:"execution_state"`
+	CheckTime          int64      `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	CheckState         int64      `gorm:"column:check_state" json:"check_state" form:"check_state"`
+	Checker            int64      `gorm:"column:checker" json:"checker" form:"checker"`
+	StartTime          int64      `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	TeamId             int64      `gorm:"column:team_id" json:"team_id" form:"team_id"`
+
+	FrequencyType        int64  `gorm:"column:frequency_type" json:"frequency_type" form:"frequency_type"`
+	DayCount             int64  `gorm:"column:day_count" json:"day_count" form:"day_count"`
+	WeekDay              string `gorm:"column:week_day" json:"week_day" form:"week_day"`
+	IsCheckTeam          int64  `gorm:"-" json:"is_check_team" form:"is_check_team"`
+	ExecutionFrequencyId int64  `gorm:"column:execution_frequency_id" json:"execution_frequency_id" form:"execution_frequency_id"`
+}
+
+type HisProject struct {
+	ID                          int64   `gorm:"column:id" json:"id" form:"id"`
+	ProjectName                 string  `gorm:"column:project_name" json:"project_name" form:"project_name"`
+	Pinyin                      string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	Price                       float64 `gorm:"column:price" json:"price" form:"price"`
+	Unit                        string  `gorm:"column:unit" json:"unit" form:"unit"`
+	CostClassify                int64   `gorm:"column:cost_classify" json:"cost_classify" form:"cost_classify"`
+	ExecutiveSection            int64   `gorm:"column:executive_section" json:"executive_section" form:"executive_section"`
+	MedicalCoverage             int64   `gorm:"column:medical_coverage" json:"medical_coverage" form:"medical_coverage"`
+	StatisticalClassification   int64   `gorm:"column:statistical_classification" json:"statistical_classification" form:"statistical_classification"`
+	DiseaseDirectory            int64   `gorm:"column:disease_directory" json:"disease_directory" form:"disease_directory"`
+	IsRecord                    int64   `gorm:"column:is_record" json:"is_record" form:"is_record"`
+	MedicalCode                 string  `gorm:"column:medical_code" json:"medical_code" form:"medical_code"`
+	TubeColor                   int64   `gorm:"column:tube_color" json:"tube_color" form:"tube_color"`
+	MedicalStatus               int64   `gorm:"column:medical_status" json:"medical_status" form:"medical_status"`
+	Remark                      string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Sign                        int64   `gorm:"column:sign" json:"sign" form:"sign"`
+	DefaultNumber               string  `gorm:"column:default_number" json:"default_number" form:"default_number"`
+	IsDefault                   int64   `gorm:"column:is_default" json:"is_default" form:"is_default"`
+	IsCharge                    int64   `gorm:"column:is_charge" json:"is_charge" form:"is_charge"`
+	IsEstimate                  int64   `gorm:"column:is_estimate" json:"is_estimate" form:"is_estimate"`
+	IsWorkload                  int64   `gorm:"column:is_workload" json:"is_workload" form:"is_workload"`
+	Sort                        string  `gorm:"column:sort" json:"sort" form:"sort"`
+	DoctorAdvice                int64   `gorm:"column:doctor_advice" json:"doctor_advice" form:"doctor_advice"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_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"`
+	DeliveryWay                 string  `gorm:"column:delivery_way" json:"delivery_way" form:"delivery_way"`
+	NumberDays                  string  `gorm:"column:number_days" json:"number_days" form:"number_days"`
+	Total                       string  `gorm:"column:total" json:"total" form:"total"`
+	Category                    int64   `gorm:"column:category" json:"category" form:"category"`
+	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
+	SpecailProject              int64   `gorm:"column:specail_project" json:"specail_project" form:"specail_project"`
+	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	RecordDate                  int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
+	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
+}
+
+func (HisProject) TableName() string {
+	return "xt_his_project"
+}
+
+func (HisPrintPrescriptionProject) TableName() string {
+	return "his_prescription_project"
+}
+
 func GetBatchProjectHisPrescription(ids []string, record_time int64, user_org_id int64) (patients []*models.PrintPatient, err error) {
 	readDb.Model(&models.PrintPatient{}).Preload("HisPrintPatient", "status = 1 AND record_date = ?", record_time).
 		Preload("HisPrintPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND type <> 1 AND p_type = 2", user_org_id, record_time).
 				Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-					return db.Joins("Join xt_his_project p On p.id = his_prescription_project.project_id  AND p.cost_classify != 3").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
+					return db.Joins("").Joins("Join xt_his_project p On p.id = his_prescription_project.project_id ").Where("his_prescription_project.status = 1 AND his_prescription_project.user_org_id = ?", user_org_id).Where("his_prescription_project.status = 1 ").Preload("HisProject", "status = 1").Preload("GoodInfo", "status=1")
 				})
 		}).
 		Preload("HisPrescriptionInfoTwo", "status = 1 AND record_date = ?", record_time).
 		Where("id in (?) AND user_org_id = ?  ", ids, user_org_id).Find(&patients)
-	return
 
+	return
 }
 
 func GetBatchInspectionProjectHisPrescription(ids []string, record_time int64, user_org_id int64) (patients []*models.PrintPatient, err error) {

service/schedule_service.go

@@ -111,7 +111,7 @@ func GetWeekScheduleOne(orgID int64, start, end int64, partionid int64, schedule
 	return
 }
 
-func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.Schedule, err error) {
+func GetWeekScheduleTwo(orgID int64, start, end int64, schIds []string, scheduletype int64) (schedules []*models.ScheduleTwo, err error) {
 
 	db := readDb.Table("xt_schedule as s")
 	if len(schIds) > 0 {
@@ -154,7 +154,7 @@ func GetScheduleTotalCount(orgID int64, start, end int64, schIds []string, sched
 
 }
 
-func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.Schedule, err error) {
+func GetWeekScheduleThree(orgID int64, start, end int64, schIds []string, scheduletype int64, WeekDayIds []string) (schedules []*models.ScheduleTwo, err error) {
 
 	db := readDb.Table("xt_schedule as s")
 
@@ -496,14 +496,57 @@ type WeekSchedulePrintVM struct {
 	Mode         *models.TreatmentMode `gorm:"ForeignKey:ModeID" json:"mode"`
 }
 
+type WeekSchedulePrintPatients 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"`
+	Name      string `gorm:"column:name" json:"name" form:"name"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (WeekSchedulePrintPatients) TableName() string {
+	return "xt_patients"
+}
+
+type WeekSchedulePrintDeviceNumber 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     int64  `gorm:"column:status" json:"status" form:"status"`
+	CreateTime int64  `gorm:"column:ctime" json:"-"`
+	ModifyTime int64  `gorm:"column:mtime" json:"-"`
+	Sort       int64  `gorm:"column:sort" json:"sort" form:"sort"`
+}
+
+func (WeekSchedulePrintDeviceNumber) TableName() string {
+	return "xt_device_number"
+}
+
+type WeekSchedulePrintVMTwo struct {
+	ID             int64 `gorm:"column:id" json:"id"`
+	ZoneID         int64 `gorm:"column:partition_id" json:"zone_id"`
+	DeviceNumberID int64 `gorm:"column:bed_id" json:"device_number_id"`
+	PatientID      int64 `gorm:"column:patient_id" json:"patient_id"`
+	ScheduleDate   int64 `gorm:"column:schedule_date" json:"schedule_date"`
+	ScheduleType   int64 `gorm:"column:schedule_type" json:"schedule_type"`
+	ScheduleWeek   int64 `gorm:"column:schedule_week" json:"schedule_week"`
+	ModeID         int64 `gorm:"column:mode_id" json:"mode_id"`
+
+	Patient      *WeekSchedulePrintPatients     `gorm:"ForeignKey:PatientID" json:"patient"`
+	DeviceNumber *WeekSchedulePrintDeviceNumber `gorm:"ForeignKey:DeviceNumberID" json:"device_number"`
+	Zone         *models.DeviceZone             `gorm:"ForeignKey:ZoneID" json:"zone"`
+	Mode         *models.TreatmentMode          `gorm:"ForeignKey:ModeID" json:"mode"`
+}
+
 type PrintCount struct {
 	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
 	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week"`
 	Count        int64
 }
 
-func GetPrinitWeekSchedules(orgID int64, start, end int64) ([]*WeekSchedulePrintVM, error) {
-	var schedules []*WeekSchedulePrintVM
+func GetPrinitWeekSchedules(orgID int64, start, end int64) ([]*WeekSchedulePrintVMTwo, error) {
+	var schedules []*WeekSchedulePrintVMTwo
 	err := readDb.Table("xt_schedule as s").
 		Preload("Patient", "status = 1 and user_org_id = ?", orgID).
 		Preload("DeviceNumber", "status = 1 and org_id = ?", orgID).
@@ -878,7 +921,7 @@ 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 and dialysis_date = ?", scheduleDate).Preload("XtAssessmentBeforeDislysis", "status = 1 and assessment_date =?", scheduleDate).Preload("DoctorAdvice", 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("SchedulesPatientsVM", "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 = ? and user_org_id = ? ", scheduleDate, orgid).Preload("DialysisPrescription", "status = 1 and record_date =? and user_org_id = ?", scheduleDate, orgid).Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1").Order("id asc")