历史排班

controllers/base_api_controller.go

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10633 //机构id
+		subscibe.OrgId = 10340 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 14    //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10633 //机构id小英9675或4
+		subscibe.OrgId = 10340 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10633 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10340 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 14    //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

 	}
 
 	//查询排班里面的空透析器
-	if orgid == 10375 || orgid == 10510 || orgid == 9538 || orgid == 10610 {
+	if orgid == 10375 || orgid == 10510 || orgid == 9538 || orgid == 10610 || orgid == 10679 {
 
 		schedulesFive, _ := service.GetMobileScheduleListByScheduleDateOne(orgid, startTime)
 

controllers/sign_api_controller.go

 
 func (this *SignApiController) ToAutoDiagnose() {
 
-	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 
 	//order, _ := service.GetDialysisOrderTotalCount()
 	//
 	//	service.UpdateAllPatient(item.BloodId, item.Diagnose, item.UserOrgId)
 	//}
 
-	//list, _ := service.GetAllDialysisOrder(10469)
-	//for _, item := range list {
-	//	schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
-	//	service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
-	//}
-
-	drugList, _ := service.GetAllBaseDrugList(10318)
-	for _, item := range drugList {
-		service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
-
-		//service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
+	list, _ := service.GetAllDialysisOrder(14749)
+	for _, item := range list {
+		schedule, _ := service.GetLastScheduleByUserOrg(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType)
+		service.UpdateScheduleByOrder(item.PatientId, item.DialysisDate, orgId, item.BedId, item.ZoneId, item.SchedualType, schedule.ID)
 	}
 
+	//drugList, _ := service.GetAllBaseDrugList(10318)
+	//for _, item := range drugList {
+	//	service.UpdateDrugWarehouseInfoByDrug(item.ID, item.MinPrice, item.OrgId)
+	//
+	//	//service.UpdateHisDoctorAdviceOne(item.ID, item.MinPrice, item.OrgId)
+	//}
+
 	//goodList, _ := service.GetAllGoodList(10571)
 	//for _, item := range goodList {
 	//	service.UpdasteGoodWarehouseInfoByGood(item.ID, item.PackingPrice, item.OrgId)

models/patient_models.go

 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	IsInfectious       int64  `gorm:"column:is_infectious" json:"is_infectious" form:"is_infectious"`
 }
 
 func (MSchedualPatientList) TableName() string {
 	TreatmentSummary        TreatmentSummary        `json:"treatment_summary" gorm:"foreignkey:AssessmentDate;AssociationForeignKey:DialysisDate;"`
 	Device                  DeviceNumber            `json:"device" gorm:"foreignkey:ID;AssociationForeignKey:BedID;"`
 	MonitoringRecord        []MonitoringRecord      `json:"monitoring_record" gorm:"foreignkey:MonitoringDate;AssociationForeignKey:DialysisDate;"`
+	DoctorAdvice            []DoctorAdvice          `json:"doctor_advice" gorm:"foreignkey:AdviceDate;AssociationForeignKey:DialysisDate;"`
 }
 
 type DialysisPrescriptionAddtional struct {

service/patient_service.go

 
 	db := readDb.Table("xt_patients as p").Where("p.user_org_id=? and p.status=1", orgID)
 
-	err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time").Count(&total).Find(&patients).Error
+	err = db.Select(" p.id, p.user_org_id, p.user_id, p.patient_type, p.dialysis_no, p.admission_number, p.source, p.lapseto, p.partition_id, p.bed_id, p.name, p.alias, p.gender, p.marital_status, p.id_card_no, p.birthday, p.reimbursement_way_id, p.health_care_type, p.health_care_no, p.health_care_due_date, p.height, p.blood_type, p.rh, p.health_care_due_alert_date, p.education_level, p.profession, p.phone, p.home_telephone, p.relative_phone, p.relative_relations, p.home_address, p.work_unit, p.unit_address, p.children, p.receiving_date, p.is_hospital_first_dialysis, p.first_dialysis_date, p.first_dialysis_hospital, p.induction_period, p.initial_dialysis, p.total_dialysis, p.attending_doctor_id, p.head_nurse_id, p.evaluate, p.diagnose, p.remark, p.registrars_id, p.registrars, p.qr_code, p.binding_state, p.status, p.created_time, p.updated_time,p.age,p.id_card_no").Count(&total).Find(&patients).Error
 	return
 }
 
 	// Where("do.patient_id=? and do.user_org_id=? and do.stage = 2 and do.status=1", patientID, orgID).Count(&total).Offset(offset).Limit(limit).Order("do.dialysis_date desc").Select(" do.id, do.dialysis_date, do.user_org_id, do.patient_id, do.prescription_id, do.stage, do.remark, do.status, do.created_time, do.updated_time, s.schedule_type, s.partition_id, dz.name as partition_name").Find(&orders).Error
 
 	db := readDb.Table("xt_dialysis_order as do").
+		Preload("DoctorAdvice", "patient_id =? and user_org_id = ? and status =1", patientID, orgID).
 		Preload("DialysisPrescription", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("PredialysisEvaluation", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
 		db = db.Where("dp.mode_id=?", mode_id)
 	}
 
-	err = db.Count(&total).Offset(offset).Limit(limit).Order("do.dialysis_date desc").Select("do.bed_id, do.id, do.dialysis_date, do.user_org_id, do.patient_id, do.prescription_id, do.stage, do.remark, do.status, do.created_time, do.updated_time,do.start_nurse,do.finish_nurse ,s.schedule_type, s.partition_id, dz.name as partition_name").Find(&orders).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("do.dialysis_date desc").Select("do.bed_id, do.id, do.dialysis_date, do.user_org_id, do.patient_id, do.prescription_id, do.stage, do.remark, do.status, do.created_time, do.updated_time,do.start_nurse,do.finish_nurse ,do.start_time,do.end_time,do.url,s.schedule_type, s.partition_id, dz.name as partition_name").Find(&orders).Error
 
 	if len(orders) > 0 {
 		ids := make([]int64, 0)

service/sign_service.go

 
 func GetAllDialysisOrder(user_org_id int64) (list []*models.XtDialysisOrder, err error) {
 
-	err = XTReadDB().Where("patient_id = ? and status =1", 28449).Find(&list).Error
+	err = XTReadDB().Where("patient_id = ? and status =1", 14749).Find(&list).Error
 
 	return list, err
 }