医保对接

controllers/doctors_api_controller.go

@@ -85,6 +85,25 @@ func (c *DoctorsApiController) ScheduleAdvices() {
 
 	project, _ := service.GetPCHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, partition_type)
 
+	index := 0
+	for _, item := range project {
+		for _, subItem := range item.HisPrescriptionTeamProject {
+
+			if subItem.HisProject.CostClassify != 3 {
+				subItem.IsCheckTeam = 2
+				item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+			}
+
+			if subItem.HisProject.CostClassify == 3 {
+				subItem.IsCheckTeam = 1
+				index = index + 1
+				if index == 1 {
+					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+				}
+			}
+		}
+	}
+
 	config, _ := service.GetHisDoctorConfig(orgID)
 	project_config, _ := service.GetHisProjectConfig(orgID)
 

controllers/his_api_controller.go

@@ -3250,7 +3250,7 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 		}
 
-		allTotal := fmt.Sprintf("%.2f", total)
+		allTotal := fmt.Sprintf("%.4f", total)
 		totals, _ := strconv.ParseFloat(allTotal, 64)
 		order := &models.HisOrder{
 			UserOrgId:             adminUser.CurrentOrgId,
@@ -3295,8 +3295,8 @@ func (c *HisApiController) GetUploadInfo() {
 					cus := &Custom{
 						AdviceId:         subItem.ID,
 						ProjectId:        0,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*subItem.PrescribingNumber),
-						Cut:              fmt.Sprintf("%.2f", subItem.PrescribingNumber),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*subItem.PrescribingNumber),
+						Cut:              fmt.Sprintf("%.4f", subItem.PrescribingNumber),
 						FeedetlSn:        subItem.FeedetlSn,
 						Price:            fmt.Sprintf("%.2f", subItem.Price),
 						MedListCodg:      subItem.MedListCodg,
@@ -3310,10 +3310,10 @@ func (c *HisApiController) GetUploadInfo() {
 					cus := &Custom{
 						AdviceId:         0,
 						ProjectId:        subItem.ID,
-						DetItemFeeSumamt: fmt.Sprintf("%.2f", subItem.Price*float64(subItem.Count)),
-						Cut:              fmt.Sprintf("%.2f", float64(subItem.Count)),
+						DetItemFeeSumamt: fmt.Sprintf("%.4f", subItem.Price*float64(subItem.Count)),
+						Cut:              fmt.Sprintf("%.4f", float64(subItem.Count)),
 						FeedetlSn:        subItem.FeedetlSn,
-						Price:            fmt.Sprintf("%.2f", float64(subItem.Price)),
+						Price:            fmt.Sprintf("%.4f", float64(subItem.Price)),
 						MedListCodg:      subItem.MedListCodg,
 						Type:             2,
 					}
@@ -3325,10 +3325,10 @@ func (c *HisApiController) GetUploadInfo() {
 					ItemId:           item.ID,
 					AdviceId:         0,
 					ProjectId:        0,
-					DetItemFeeSumamt: fmt.Sprintf("%.2f", item.Price),
-					Cut:              fmt.Sprintf("%.2f", float64(item.Count)),
+					DetItemFeeSumamt: fmt.Sprintf("%.4f", item.Price),
+					Cut:              fmt.Sprintf("%.4f", float64(item.Count)),
 					FeedetlSn:        item.FeedetlSn,
-					Price:            fmt.Sprintf("%.2f", float64(item.Price)),
+					Price:            fmt.Sprintf("%.4f", float64(item.Price)),
 					MedListCodg:      item.XtHisAddtionConfig.Code,
 					Type:             3,
 				}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -379,6 +379,23 @@ func (this *DialysisAPIController) DialysisRecord() {
 	_, is_project_open_config := service.FindXTHisProjectByOrgId(adminInfo.Org.Id)
 
 	projects, _ := service.GetHisPrescriptionProjects(adminInfo.Org.Id, patientID, date.Unix())
+	temp_team_projects, _ := service.GetHisPrescriptionTeamProjects(adminInfo.Org.Id, patientID, date.Unix())
+
+	var team_projects []*models.HisPrescriptionProject
+	var index int64 = 0
+	for _, item := range temp_team_projects {
+		//组套里面非检验项目的
+		if item.HisProject.CostClassify != 3 {
+			projects = append(projects, item)
+		}
+		//组套里面检验项目的
+		if item.HisProject.CostClassify == 3 {
+			index = index + 1
+			if index == 1 {
+				team_projects = append(team_projects, item)
+			}
+		}
+	}
 
 	stockType, _ := service.GetStockType(adminInfo.Org.Id)
 
@@ -446,6 +463,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"prescribeOne":                   prescribeOne,
 		"is_project_open_config":         is_project_open_config,
 		"project":                        projects,
+		"team_projects":                  team_projects,
 	}
 	this.ServeSuccessJSON(returnData)
 }

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -44,6 +44,26 @@ func (this *DoctorAdviceAPIController) ScheduleAdvices() {
 	if project_config.IsOpen == 1 || project_config.IsOpen == 2 {
 		//获取his医嘱数据
 		project, _ := service.GetMobileHisPrescriptionProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		//team_project, _ := service.GetMobileHisPrescriptionTeamProject(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
+		index := 0
+		for _, item := range project {
+			for _, subItem := range item.HisPrescriptionTeamProject {
+
+				if subItem.HisProject.CostClassify != 3 {
+					subItem.IsCheckTeam = 2
+					item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+				}
+
+				if subItem.HisProject.CostClassify == 3 {
+					subItem.IsCheckTeam = 1
+					index = index + 1
+					if index == 1 {
+						item.HisPrescriptionProject = append(item.HisPrescriptionProject, subItem)
+					}
+				}
+			}
+		}
+
 		hisAdvices, _ := service.GetHisDoctorAdvicesTwo(orgID, date.Unix(), delivery_way, patientType, adminInfo.AdminUser.Id)
 		adminUser, _ := service.GetAllAdminUsers(orgID, adminInfo.App.Id)
 		if err != nil {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3342,6 +3342,8 @@ func (this *PatientApiController) GetSearchPatient() {
 func (c *PatientApiController) ExecProject() {
 	execution_time := c.GetString("execution_time")
 	project_id, _ := c.GetInt64("project_id")
+	team_id, _ := c.GetInt64("team_id")
+	is_check_team, _ := c.GetInt64("is_check_team")
 
 	if len(execution_time) <= 0 {
 		utils.ErrorLog("execution_time")
@@ -3357,6 +3359,7 @@ func (c *PatientApiController) ExecProject() {
 		return
 	}
 	adminInfo := c.GetMobileAdminUserInfo()
+
 	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
 	if project.ExecutionState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceExced)
@@ -3366,29 +3369,63 @@ func (c *PatientApiController) ExecProject() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeExceAndCheckNotOneUser)
 		return
 	}
-
 	project.ExecutionState = 1
 	project.ExecutionStaff = adminInfo.AdminUser.Id
 	project.ExecutionTime = theTime.Unix()
-	err := service.SaveHisProject(&project)
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"project": project,
-		})
+	if team_id == 0 {
+
+		err := service.SaveHisProject(&project)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"project": project,
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+
+		}
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
 
-	}
+			err := service.SaveHisProject(&project)
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+		} else {
+			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			var ids []int64
+			for _, items := range ps {
+				ids = append(ids, items.ID)
+			}
+			err := service.UpdateTeamProjectExceStatus(ids, adminInfo.AdminUser.Id, theTime.Unix())
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
 
+			}
+		}
+
+	}
 }
 
 func (c *PatientApiController) CheckProject() {
 
 	adminInfo := c.GetMobileAdminUserInfo()
 	project_id, _ := c.GetInt64("project_id")
-	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
+	team_id, _ := c.GetInt64("team_id")
+	is_check_team, _ := c.GetInt64("is_check_team")
 
+	project, _ := service.FindHisProjectById(adminInfo.Org.Id, project_id)
 	if project.CheckState == 1 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdviceChecked)
 		return
@@ -3401,18 +3438,52 @@ func (c *PatientApiController) CheckProject() {
 	project.Checker = adminInfo.AdminUser.Id
 	project.CheckTime = time.Now().Unix()
 	project.CheckState = 1
+	if team_id == 0 {
+		err := service.SaveHisProject(&project)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":     "ok",
+				"project": project,
+			})
 
-	err := service.SaveHisProject(&project)
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
 
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg":     "ok",
-			"project": project,
-		})
+		}
 
 	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+		if is_check_team == 2 { //虽然是组套数据，但不是检验项目
+			err := service.SaveHisProject(&project)
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"msg":     "ok",
+					"project": project,
+				})
+
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+
+		} else {
+			ps, _ := service.GetCheckTeamProject(team_id, project.PatientId, project.RecordDate, project.UserOrgId)
+			var ids []int64
+			for _, items := range ps {
+				ids = append(ids, items.ID)
+			}
+			err := service.UpdateTeamProjectCheckStatus(ids, project.PatientId, project.RecordDate, project.UserOrgId, adminInfo.AdminUser.Id, time.Now().Unix())
+			if err == nil {
+				c.ServeSuccessJSON(map[string]interface{}{
+					"project": project,
+				})
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+
+			}
+		}
 
 	}
 

models/his_models.go

@@ -778,6 +778,7 @@ type HisPrescriptionProject struct {
 	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"`
 }
 
 func (HisPrescriptionProject) TableName() string {

service/dialysis_service.go

@@ -1233,3 +1233,35 @@ func FindAllHisProjectById(orgID int64, patient_id int64, record_time int64) (ad
 	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id=? and status=1 and patient_id = ? AND record_date = ?", orgID, patient_id, record_time).Find(&advice).Error
 	return
 }
+
+func UpdateTeamProjectExceStatus(ids []int64, admin_user_id int64, execution_time int64) (err error) {
+	ut := writeDb.Begin()
+	db := ut.Model(&models.HisPrescriptionProject{})
+	err = db.Where("status = 1   AND id IN (?)", ids).Updates(map[string]interface{}{"execution_time": execution_time, "execution_state": 1, "execution_staff": admin_user_id}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+
+	ut.Commit()
+	return err
+
+}
+
+func UpdateTeamProjectCheckStatus(ids []int64, patient_id int64, record_date int64, user_org_id int64, admin_user_id int64, check_time int64) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.HisPrescriptionProject{}).Where("status = 1   AND id IN (?) AND patient_id = ? AND user_org_id = ? AND record_date = ?", ids, patient_id, user_org_id, record_date).Updates(map[string]interface{}{"check_time": check_time, "check_state": 1, "checker": admin_user_id}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+
+	ut.Commit()
+	return err
+
+}
+
+func GetCheckTeamProject(team_id int64, patient_id int64, record_date int64, user_org_id int64) (ps []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Joins("JOIN xt_his_project as p On p.id = his_prescription_project.project_id AND p.cost_classify = 3").Where("his_prescription_project.team_id IN (?) AND his_prescription_project.patient_id = ? AND his_prescription_project.user_org_id = ? AND his_prescription_project.record_date = ? AND his_prescription_project.status = 1", team_id, patient_id, user_org_id, record_date).Find(&ps).Error
+	return
+}

service/his_service.go

@@ -1984,7 +1984,12 @@ func GetHisPrescriptionProjectsByID(id int64) (projects []*models.HisPrescriptio
 }
 
 func GetHisPrescriptionProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
-	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1", user_org_id, patient_id, record_time).Find(&projects).Error
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id = 0", user_org_id, patient_id, record_time).Find(&projects).Error
+	return
+}
+
+func GetHisPrescriptionTeamProjects(user_org_id int64, patient_id int64, record_time int64) (projects []*models.HisPrescriptionProject, err error) {
+	err = readDb.Model(&models.HisPrescriptionProject{}).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject", "status = 1").Preload("GoodInfo", "status = 1").Where("user_org_id = ? AND patient_id = ? AND record_date = ? AND  status = 1 AND team_id > 0", user_org_id, patient_id, record_time).Find(&projects).Error
 	return
 }
 

service/mobile_dialysis_service.go

@@ -1181,7 +1181,10 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).
 			Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
@@ -1202,7 +1205,10 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).
 			Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
@@ -1214,6 +1220,52 @@ func GetMobileHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay
 	return vms, err
 }
 
+//func GetMobileHisPrescriptionTeamProject(orgID int64, scheduleDate int64, deliverWay string, patientType int, adminUserId int64) ([]*HisMScheduleProjectVM, error) {
+//	var vms []*HisMScheduleProjectVM
+//	if patientType == 0 {
+//		db := readDb.
+//			Table("xt_schedule").
+//			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+//			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+//				return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+//			}).
+//			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+//			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+//			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+//			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+//				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Group("team_id").Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+//			}).
+//			Where("status = 1 AND user_org_id = ?", orgID)
+//		if scheduleDate != 0 {
+//			db = db.Where("schedule_date = ?", scheduleDate)
+//		}
+//		err = db.Find(&vms).Error
+//	}
+//
+//	if patientType > 0 {
+//		db := readDb.
+//			Table("xt_schedule").
+//			Preload("SchedualPatient", "status = 1 AND user_org_id = ?", orgID).
+//			Preload("DialysisOrder", func(db *gorm.DB) *gorm.DB {
+//				return db.Where("status = 1 AND user_org_id = ? AND dialysis_date = ?", orgID, scheduleDate).Preload("DeviceNumber", "status = 1 AND org_id= ?", orgID)
+//			}).
+//			Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).
+//			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
+//			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
+//			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
+//			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+//				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+//			}).
+//			Where("status = 1 AND user_org_id = ?", orgID)
+//		if scheduleDate != 0 {
+//			db = db.Where("schedule_date = ?", scheduleDate)
+//		}
+//		err = db.Find(&vms).Error
+//	}
+//
+//	return vms, err
+//}
+
 func MobileCreateDialysisOrder(orgID int64, patientID int64, order *models.DialysisOrder) error {
 	now := time.Now()
 	tx := writeDb.Begin()
@@ -2070,20 +2122,21 @@ func (HisMScheduleDoctorAdviceVMOne) TableName() string {
 }
 
 type HisMScheduleProjectVM struct {
-	ID                     int64                            `gorm:"column:id" json:"id"`
-	UserOrgId              int64                            `gorm:"column:user_org_id" json:"user_org_id"`
-	PartitionId            int64                            `gorm:"column:partition_id" json:"partition_id"`
-	BedId                  int64                            `gorm:"column:bed_id" json:"bed_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"`
-	ModeId                 int64                            `gorm:"column:mode_id" json:"mode_id"`
-	Status                 int64                            `gorm:"column:status" json:"status"`
-	DialysisOrder          *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
-	SchedualPatient        *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
-	DeviceNumber           *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
-	Prescription           *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
-	HisPrescriptionProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	ID                         int64                            `gorm:"column:id" json:"id"`
+	UserOrgId                  int64                            `gorm:"column:user_org_id" json:"user_org_id"`
+	PartitionId                int64                            `gorm:"column:partition_id" json:"partition_id"`
+	BedId                      int64                            `gorm:"column:bed_id" json:"bed_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"`
+	ModeId                     int64                            `gorm:"column:mode_id" json:"mode_id"`
+	Status                     int64                            `gorm:"column:status" json:"status"`
+	DialysisOrder              *MDialysisOrderVM                `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"dialysis_order"`
+	SchedualPatient            *MSchedualPatientVM              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
+	DeviceNumber               *MDeviceNumberVM                 `gorm:"ForeignKey:BedId" json:"device_number"`
+	Prescription               *models.DialysisPrescriptionList `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"prescription"`
+	HisPrescriptionProject     []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"project"`
+	HisPrescriptionTeamProject []*models.HisPrescriptionProject `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"team_project"`
 }
 
 func (HisMScheduleProjectVM) TableName() string {
@@ -2436,7 +2489,10 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 			Preload("DeviceNumber.Zone", "status = 1 AND org_id = ?", orgID).
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
 			db = db.Where("schedule_date = ?", scheduleDate)
@@ -2456,9 +2512,11 @@ func GetPCHisPrescriptionProject(orgID int64, scheduleDate int64, deliverWay str
 			Preload("Prescription", "status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).
 			Preload("HisDoctorAdviceInfo", "status = 1 AND user_org_id = ? AND advice_date = ? and  (advice_doctor = ? or execution_staff = ?) ", orgID, scheduleDate, adminUserId, adminUserId).
 			Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-				return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id = 0", orgID, scheduleDate).Preload("HisProject").Preload("GoodInfo", "status=1")
 			}).
-			Where("status = 1 AND user_org_id = ?", orgID)
+			Preload("HisPrescriptionTeamProject", func(db *gorm.DB) *gorm.DB {
+				return db.Where("status = 1 AND user_org_id = ? AND record_date = ? AND team_id > 0", orgID, scheduleDate).Preload("XtHisProjectTeam", "status = 1").Preload("HisProject").Preload("GoodInfo", "status=1")
+			}).Where("status = 1 AND user_org_id = ?", orgID)
 		if scheduleDate != 0 {
 			db = db.Where("schedule_date = ?", scheduleDate)
 		}