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

controllers/dialysis_api_controller.go

@@ -2609,8 +2609,8 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		}
 
 		//if adviceNameM["single_dose"] != nil && reflect.TypeOf(adviceNameM["single_dose"]).String() == "string" {
-		//	singleDose, _ := strconv.ParseFloat(adviceNameM["single_dose"].(string), 64)
-		//	advice.SingleDose = singleDose
+		// singleDose, _ := strconv.ParseFloat(adviceNameM["single_dose"].(string), 64)
+		// advice.SingleDose = singleDose
 		//}
 
 		if adviceNameM["single_dose"] != nil || reflect.TypeOf(adviceNameM["single_dose"]).String() == "float64" {
@@ -2624,8 +2624,8 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		}
 
 		//if adviceNameM["prescribing_number"] != nil && reflect.TypeOf(adviceNameM["prescribing_number"]).String() == "string" {
-		//	prescribingNumber, _ := strconv.ParseFloat(adviceNameM["prescribing_number"].(string), 64)
-		//	advice.PrescribingNumber = prescribingNumber
+		// prescribingNumber, _ := strconv.ParseFloat(adviceNameM["prescribing_number"].(string), 64)
+		// advice.PrescribingNumber = prescribingNumber
 		//}
 
 		if adviceNameM["prescribing_number"] != nil || reflect.TypeOf(adviceNameM["prescribing_number"]).String() == "float64" {

controllers/doctors_api_controller.go

@@ -229,10 +229,8 @@ func (c *DoctorsApiController) GetAllData() {
 	fmt.Println("id", id)
 	adminUserInfo := c.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	dry, total, err := service.GetAllData(orgid, id, page, limit)
-	fmt.Println("total是是多少", total)
-	fmt.Println("错误是什么", err)
-	fmt.Println("dry", err)
+	dry, total, _ := service.GetAllData(orgid, id, page, limit)
+
 	c.ServeSuccessJSON(map[string]interface{}{
 		"dry":   dry,
 		"total": total,

controllers/his_api_controller.go

@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
-	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
@@ -570,20 +569,27 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 		Remark:                  remark,
 	}
 
-	//查询该患者是否有病历
-	_, errcode := service.GetHisPatientCaseHistoryById(his_patient_id)
-	if errcode == gorm.ErrRecordNotFound {
-		err = service.SaveHisPatientCaseHistory(caseHistory)
-		if err != nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "保存成功",
-			})
-		}
-	} else if errcode == nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
-		return
+	err = service.SaveHisPatientCaseHistory(caseHistory)
+	if err != nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "保存成功",
+		})
 	}
 
+	//查询该患者是否有病历
+	//_, errcode := service.GetHisPatientCaseHistoryById(his_patient_id)
+	//if errcode == gorm.ErrRecordNotFound {
+	//	err = service.SaveHisPatientCaseHistory(caseHistory)
+	//	if err != nil {
+	//		c.ServeSuccessJSON(map[string]interface{}{
+	//			"msg": "保存成功",
+	//		})
+	//	}
+	//} else if errcode == nil {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+	//	return
+	//}
+
 }
 func (c *HisApiController) GetHisPatientCaseHistoryList() {
 	patient_id, _ := c.GetInt64("patient_id", 0)
@@ -674,10 +680,10 @@ func (c *HisApiController) GetCaseHistoryTemplate() {
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	admin := c.GetAdminUserInfo()
 	template, _ := service.GetHisPatientCaseHistoryTemplate(admin.CurrentOrgId, startTime.Unix(), endTime.Unix(), keyword)
-	history, _ := service.GetHisPatientCaseHistory(admin.CurrentOrgId)
+	//history, _ := service.GetHisPatientCaseHistory(admin.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"template": template,
-		"history":  history,
+		//"history":  history,
 	})
 
 }

controllers/his_project_api_controller.go

@@ -59,6 +59,7 @@ func HisProjectRouters() {
 	beego.Router("/api/patient/getpatientcasehistory", &HisProjectApiController{}, "Get:GetPatientcaseHistory")
 	beego.Router("/api/doctorworkstation/gettemplatedetail", &HisProjectApiController{}, "Get:GetTemplateDetail")
 	beego.Router("/api/doctorworkstation/updaterecordtemplate", &HisProjectApiController{}, "Get:UpdateRecordTemplate")
+	beego.Router("/api/hispatient/gehispatient", &HisProjectApiController{}, "Get:GetHisPatient")
 }
 
 func (this *HisProjectApiController) SaveProject() {
@@ -129,9 +130,7 @@ func (this *HisProjectApiController) SaveProject() {
 	}
 	//查询项目名称是否存在
 	_, errcode := service.GetHisProjectIsExist(project_name, orgId)
-	fmt.Println("9999999999999", errcode)
 	if errcode == gorm.ErrRecordNotFound {
-		fmt.Println("222")
 		err = service.CreateHisProject(&hisProject)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
@@ -160,7 +159,6 @@ func (this *HisProjectApiController) GetProjectList() {
 
 	keyword := this.GetString("keyword")
 	projecList, total, err := service.GetHisProjectList(orgId, limit, page, is_charge, is_start, keyword)
-	fmt.Println("err", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
@@ -498,10 +496,8 @@ func (this *HisProjectApiController) GetBloodPatientList() {
 
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	fmt.Println("org", orgId)
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
-	fmt.Println("timeStr:", timeStr)
 	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
 	timenow := timeStringToTime.Unix()
 
@@ -528,7 +524,6 @@ func (this *HisProjectApiController) GetHisPrescription() {
 	id, _ := this.GetInt64("id")
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
-	fmt.Println("timeStr:", timeStr)
 	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
 	timenow := timeStringToTime.Unix()
 	prescriptionList, err := service.GetHisPrescriptionByPatientId(id, timenow)
@@ -549,14 +544,12 @@ func (this *HisProjectApiController) AdditionalCharge() {
 	fmt.Println(err)
 	his_patient_id := int64(dataBody["his_patient_id"].(float64))
 	patient_id := int64(dataBody["patient_id"].(float64))
-	fmt.Println("patient_id2222222222", patient_id)
 	medicineData, _ := dataBody["medicineData"].([]interface{})
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	admin_user_id := adminUserInfo.AdminUser.Id
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
-	fmt.Println("timeStr:", timeStr)
 	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
 	timenow := timeStringToTime.Unix()
 	for _, item := range medicineData {
@@ -594,7 +587,6 @@ func (this *HisProjectApiController) GetTreatmentList() {
 	patient_id, _ := this.GetInt64("patient_id")
 	timeStr := time.Now().Format("2006-01-02")
 	timeLayout := "2006-01-02 15:04:05"
-	fmt.Println("timeStr:", timeStr)
 	timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
 	timenow := timeStringToTime.Unix()
 	treatmentList, err := service.GetTreatmentList(patient_id, timenow)
@@ -764,8 +756,7 @@ func (this *HisProjectApiController) SaveHisPatient() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	recordDateStr := time.Now().Format("2006-01-02")
-	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-	fmt.Println("parseDateErr", parseDateErr)
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
 	nowtime := recordDate.Unix()
 
 	bloodPatient, errcode := service.GetBloodPatientByIdCard(idcard, orgId)
@@ -839,7 +830,6 @@ func (this *HisProjectApiController) GetAllProjectTeam() {
 
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
-	fmt.Println("aaa")
 	team, err := service.GetAllProjectTeam(orgId)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
@@ -875,7 +865,6 @@ func (this *HisProjectApiController) GetHisPatientHistory() {
 	register_type, _ := this.GetInt64("register_type")
 	limit, _ := this.GetInt64("limit")
 	page, _ := this.GetInt64("page")
-	fmt.Println(keyword, start_time, end_time, register_type, limit, page)
 	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
 	adminUserInfo := this.GetAdminUserInfo()
@@ -902,8 +891,8 @@ func (this *HisProjectApiController) ChangePatient() {
 	id, _ := this.GetInt64("id")
 	//查询该患者今日是否已经就诊
 	recordDateStr := time.Now().Format("2006-01-02")
-	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
-	fmt.Println("parseDateErr", parseDateErr)
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
 	nowtime := recordDate.Unix()
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
@@ -960,7 +949,6 @@ func (this *HisProjectApiController) GetTemplateDetail() {
 func (this *HisProjectApiController) UpdateRecordTemplate() {
 	id, _ := this.GetInt64("id")
 	template_name := this.GetString("template_name")
-	fmt.Println("template_name22222222222222", template_name)
 	template_remark := this.GetString("template_remark")
 
 	diagnostic := this.GetString("diagnostic")
@@ -994,3 +982,18 @@ func (this *HisProjectApiController) UpdateRecordTemplate() {
 		"templateDetail": historyTemplate,
 	})
 }
+
+func (this *HisProjectApiController) GetHisPatient() {
+
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	keyword := this.GetString("keyword")
+	patient, err := service.GetHistPatient(orgId, keyword)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -723,7 +723,7 @@ func (c *CheckWeightApiController) GetPatientListForSchedules() {
 	syncTime := theStartTime.Unix()
 	adminUserInfo := c.GetMobileAdminUserInfo()
 	patientList, total, error := service.GetPatientListBySchedules(adminUserInfo.Org.Id, syncTime)
-	patientSchedule := make([]map[string]interface{},0)
+	patientSchedule := make([]map[string]interface{}, 0)
 	for _, item := range patientList {
 		patientTemp := make(map[string]interface{})
 		patientTemp["patient_id"] = item.PatientId
@@ -745,43 +745,41 @@ func (c *CheckWeightApiController) GetPatientListForSchedules() {
 	})
 }
 
-func (c *CheckWeightApiController) GetPatientListForSchedulesFind() {
-	patient_name := c.GetString("patient_name")                   //脉率
-	thisTime := time.Now()
-	scheduleDateStart := thisTime.Format("2006-01-02") + " 00:00:00"
-	timeLayout := "2006-01-02 15:04:05"
-	loc, _ := time.LoadLocation("Local")
-	theStartTime, _ := time.ParseInLocation(timeLayout, scheduleDateStart, loc)
-	syncTime := theStartTime.Unix()
-	adminUserInfo := c.GetMobileAdminUserInfo()
-	
-	patientList, total, error := service.GetPatientListBySchedulesFind(adminUserInfo.Org.Id, syncTime,patient_name)
-	
-	patientSchedule := make([]map[string]interface{},0)
-	for _, item := range patientList {
-		if len(item.Patient.Name) > 0 {
-			patientTemp := make(map[string]interface{})
-			patientTemp["patient_id"] = item.PatientId
-			patientTemp["patient_name"] = item.Patient.Name
-			patientTemp["schedule_type"] = item.ScheduleType
-			patientSchedule = append(patientSchedule, patientTemp)
-		}
-	}
-
-	if error != nil {
-		c.ErrorLog("获取病人列表失败:%v", error)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	serviceTime := time.Now().Unix()
-	c.ServeSuccessJSON(map[string]interface{}{
-		"patientlist": patientSchedule,
-		"total":       total,
-		"servicetime": serviceTime,
-	})
-}
-
-
+//func (c *CheckWeightApiController) GetPatientListForSchedulesFind() {
+//	patient_name := c.GetString("patient_name")                   //脉率
+//	thisTime := time.Now()
+//	scheduleDateStart := thisTime.Format("2006-01-02") + " 00:00:00"
+//	timeLayout := "2006-01-02 15:04:05"
+//	loc, _ := time.LoadLocation("Local")
+//	theStartTime, _ := time.ParseInLocation(timeLayout, scheduleDateStart, loc)
+//	syncTime := theStartTime.Unix()
+//	adminUserInfo := c.GetMobileAdminUserInfo()
+//	if len(patient_name) == 0 {
+//		patientList, total, error := service.GetPatientListBySchedules(adminUserInfo.Org.Id, syncTime)
+//	} else {
+//		patientList, total, error := service.GetPatientListBySchedulesFind(adminUserInfo.Org.Id, syncTime,patient_name)
+//	}
+//	patientSchedule := make([]map[string]interface{},0)
+//	for _, item := range patientList {
+//		patientTemp := make(map[string]interface{})
+//		patientTemp["patient_id"] = item.PatientId
+//		patientTemp["patient_name"] = item.Patient.Name
+//		patientTemp["schedule_type"] = item.ScheduleType
+//		patientSchedule = append(patientSchedule, patientTemp)
+//	}
+//
+//	if error != nil {
+//		c.ErrorLog("获取病人列表失败:%v", error)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	serviceTime := time.Now().Unix()
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"patientlist": patientSchedule,
+//		"total":       total,
+//		"servicetime": serviceTime,
+//	})
+//}
 
 func (c *CheckWeightApiController) GetPatientListById() {
 	patientId, _ := c.GetInt64("patient_id", 0)

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -13,7 +13,7 @@ func MobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/checkbeforedialysis", &CheckWeightApiController{}, "get:GetPatientInfoBeforeDialysis")
 	beego.Router("/m/api/getpatientlist", &CheckWeightApiController{}, "get:GetPatientList")
 	beego.Router("/m/api/getschedulepatient", &CheckWeightApiController{}, "get:GetPatientListForSchedules")
-	beego.Router("/m/api/getschedulepatientfind", &CheckWeightApiController{}, "get:GetPatientListForSchedulesFind")
+	//beego.Router("/m/api/getschedulepatientfind", &CheckWeightApiController{}, "get:GetPatientListForSchedulesFind")
 	beego.Router("/m/api/getpatientinfo", &CheckWeightApiController{}, "get:GetPatientListById")
 	beego.Router("/m/api/checkdialysis", &CheckWeightApiController{}, "get:GetPatientInfoDialysis")
 	beego.Router("/m/api/savecheckdialysis", &CheckWeightApiController{}, "Post:SavePatientInfoDialysis")

controllers/schedule_api_controller.go

@@ -765,6 +765,7 @@ func (this *ScheduleApiController) SearchSchedulePatients() {
 
 func (this *ScheduleApiController) GetWeekDaySchedule() {
 	week_type, _ := this.GetInt64("week_type", -1)
+	week_time, _ := this.GetInt64("week_time")
 	fmt.Println(week_type)
 	thisTime := time.Now()
 	weekDay := int(thisTime.Weekday())
@@ -822,7 +823,7 @@ func (this *ScheduleApiController) GetWeekDaySchedule() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	list, _ := service.GetWeekDaySchedule(adminUserInfo.CurrentOrgId, targetDay.Unix(), targetDay)
+	list, _ := service.GetWeekDayScheduleTwo(adminUserInfo.CurrentOrgId, targetDay.Unix(), targetDay, week_time)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"schdules": list,

models/stock_query_models.go

@@ -3,6 +3,7 @@ package models
 type StockInfo struct {
 	ID                int64  `gorm:"column:id" json:"id"`
 	GoodCode          string `gorm:"column:good_code" json:"good_code"`
+	GoodName          string `gorm:"column:good_name" json:"good_name"`
 	SpecificationName string `gorm:"column:specification_name" json:"specification_name"`
 	GoodTypeId        int64  `gorm:"column:good_type_id" json:"good_type_id"`
 	GoodUnit          int64  `gorm:"column:good_unit" json:"good_unit"`

service/his_project_service.go

@@ -304,7 +304,7 @@ func GetHisPatientHistory(keyword string, startime int64, endtime int64, registt
 	if orgid > 0 {
 		db = db.Where("x.user_org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.doctor,x.is_return").Count(&total).Offset(offset).Limit(limit).Find(&hisPatient).Error
+	err = db.Select("x.id,x.balance_accounts_type,x.medical_insurance_number,x.name,x.gender,x.id_type,x.medical_treatment_type,x.birthday,x.record_date,x.age,x.phone_number,x.id_card_no,x.register_type,x.admin_user_id,x.departments,x.is_need_cost_of_production,x.register_cost,x.treatment_cost,x.cost_of_production,x.total,x.user_org_id,x.patient_id,x.number,x.is_return,x.doctor").Count(&total).Offset(offset).Limit(limit).Find(&hisPatient).Error
 	return hisPatient, total, err
 }
 
@@ -366,3 +366,9 @@ func UpdateCaseHistoryTemplate(tem *models.HisCaseHistoryTemplate, id int64) err
 	err := XTWriteDB().Model(&tem).Where("id = ? ", id).Updates(map[string]interface{}{"history_of_present_illness": tem.HistoryOfPresentIllness, "past_history": tem.PastHistory, "chief_conplaint": tem.ChiefConplaint, "personal_history": tem.PersonalHistory, "family_history": tem.FamilyHistory, "diagnostic": tem.Diagnostic, "template_name": tem.TemplateName, "template_remark": tem.TemplateRemark, "modifier": tem.Modifier}).Error
 	return err
 }
+
+func GetHistPatient(orgid int64, keyword string) (hisPatient []*models.HisPatient, err error) {
+	likeKey := "%" + keyword + "%"
+	err = XTReadDB().Model(&hisPatient).Where("user_org_id = ? and name like ?", orgid, likeKey).Find(&hisPatient).Error
+	return hisPatient, err
+}

service/schedule_service.go

@@ -304,6 +304,101 @@ func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*m
 
 }
 
+func GetWeekDayScheduleTwo(orgID int64, scheduleDate int64, scheduleDates *time.Time, weektime int64) (schedules []*models.WeekSchedule, err error) {
+	db := readDb.Table("xt_schedule as s ").Where("s.status =1")
+	if orgID > 0 {
+		db = db.Where("s.user_org_id = ?", orgID)
+	}
+	if scheduleDate > 0 {
+		db = db.Where("s.schedule_date = ?", scheduleDate)
+
+	}
+	if weektime > 0 {
+		db = db.Where("s.schedule_type = ?", weektime)
+	}
+	err = db.
+		Preload("DeviceZone", "status = 1 ").
+		Preload("DeviceNumber", "status = 1 ").
+		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1").Order("id asc")
+		}).
+		Joins("JOIN xt_patients as p ON p.id = s.patient_id").
+		Select("s.id, s.user_org_id, s.partition_id, s.bed_id, s.patient_id, s.schedule_date, s.schedule_type, s.schedule_week, s.mode_id, s.status, s.created_time, s.updated_time, p.name as patient").
+		Order("s.partition_id asc").
+		Find(&schedules).Error
+
+	for _, item := range schedules {
+		_, config := FindDoctorAdviceRecordByOrgId(item.UserOrgId)
+		if config.IsOpenRemind > 0 {
+			//开启推送提醒逻辑    提交长期处方的时候，弹起长期医嘱推送
+			var advice_three []*models.DoctorAdvice
+			advices, _ := GetLastLongAdviceByGroupNoOther(item.UserOrgId, item.PatientId)
+			advices_two, _ := GetLastLongAdviceByGroupNoThreeOther(item.UserOrgId, item.PatientId)
+			for _, advice := range advices {
+				advice.IsCheck = 1
+				if advice.FrequencyType == 3 {
+					week := int(scheduleDates.Weekday())
+					fmt.Println(advice.WeekDay)
+					switch week {
+					case 1:
+						if strings.Index(advice.WeekDay, "周一") > -1 {
+							advice_three = append(advice_three, advice)
+						}
+						break
+					case 2:
+						if strings.Index(advice.WeekDay, "周二") > -1 {
+							advice_three = append(advice_three, advice)
+						}
+						break
+					case 3:
+						if strings.Index(advice.WeekDay, "周三") > -1 {
+							advice_three = append(advice_three, advice)
+						}
+						break
+					case 4:
+						if strings.Index(advice.WeekDay, "周四") > -1 {
+							advice_three = append(advice_three, advice)
+						}
+						break
+					case 5:
+						if strings.Index(advice.WeekDay, "周五") > -1 {
+							advice_three = append(advice_three, advice)
+						}
+						break
+					case 6:
+						if strings.Index(advice.WeekDay, "周六") > -1 {
+							advice_three = append(advice_three, advice)
+						}
+						break
+					case 0:
+						if strings.Index(advice.WeekDay, "周日") > -1 {
+							advice_three = append(advice_three, advice)
+						}
+						break
+					}
+				} else if advice.FrequencyType == 1 {
+					advice_three = append(advice_three, advice)
+				}
+			}
+
+			for _, advice := range advices_two {
+				now := scheduleDates.Unix()
+				dayStr := strconv.FormatInt(advice.DayCount, 10)
+				dayStr2 := "-" + dayStr
+				count, _ := strconv.ParseInt(dayStr2, 10, 64)
+				oldTime := scheduleDates.AddDate(0, 0, int(count)).Unix()
+				advices, _ := FindAllDoctorAdviceByTimeOther(now, oldTime, item.PatientId, item.UserOrgId, advice.TemplateId)
+				if len(advices) == 0 {
+					advice_three = append(advice_three, advice)
+				}
+			}
+
+			item.DoctorAdvice = append(item.DoctorAdvice, advice_three...)
+		}
+	}
+	return
+}
+
 func GetWeekDaySchedule(orgID int64, scheduleDate int64, scheduleDates *time.Time) (schedules []*models.WeekSchedule, err error) {
 
 	err = readDb.