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

controllers/schedule_api_controller.go

@@ -2013,8 +2013,8 @@ func (c *ScheduleApiController) DeleteSchedule() {
 	}
 
 	if adminINfo.CurrentOrgId == 10206 {
-		advice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
-		if len(advice) > 0 {
+		hisAdvice, _ := service.GetHisDoctorAdviceListTwenty(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
+		if len(hisAdvice) > 0 {
 			service.UpdateHisAdviceObj(schedule.PatientId, schedule.ScheduleDate, adminINfo.CurrentOrgId)
 		}
 	}

models/doctor_advice_models.go

@@ -44,6 +44,7 @@ type ExecutionFrequencyDic struct {
 	UpdatedTime int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	Creator     int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Count       int64  `gorm:"column:count" json:"count" form:"count"`
 }
 
 func (ExecutionFrequencyDic) TableName() string {

service/patient_service.go

@@ -2090,7 +2090,7 @@ func FindRemindAdvice(user_org_id int64, advice_name string, advice_desc string,
 }
 
 func UpdateScheduleByDeathTime(patientid int64, shcheduledate int64) error {
-	err := XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date > ?", patientid, shcheduledate).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(models.XtSchedule{}).Where("patient_id = ? and schedule_date > ?", patientid, shcheduledate).Updates(map[string]interface{}{"status": 12}).Error
 	return err
 }