Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -64,36 +65,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 400
-		//userAdmin.Mobile = "13535547901"
-		//
-		////userAdmin.Id = 597
-		////userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 12
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 12
-		//adminUserInfo.CurrentAppId = 18
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 400
+		userAdmin.Mobile = "13535547901"
+
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 12
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
@@ -315,35 +316,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 400
-		//userAdmin.Mobile = "13535547901"
-		////userAdmin.Id = 597
-		////userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 12
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 12
-		//adminUserInfo.CurrentAppId = 18
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 400
+		userAdmin.Mobile = "13535547901"
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 12
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 12
+		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/schedule_api_controller.go

@@ -683,7 +683,7 @@ func (this *ScheduleApiController) GetWeekDaySchedule() {
 	}
 
 	adminUserInfo := this.GetAdminUserInfo()
-	list, _ := service.GetWeekDaySchedule(adminUserInfo.CurrentOrgId, targetDay.Unix())
+	list, _ := service.GetWeekDaySchedule(adminUserInfo.CurrentOrgId, targetDay.Unix(), targetDay)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"schdules": list,

models/dialysis.go

@@ -385,6 +385,7 @@ type DoctorAdvice struct {
 	ChildDoctorAdvice     []*DoctorAdvice `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
 	TemplateId            string          `gorm:"column:template_id" json:"template_id"`
 	Modifier              int64           `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	IsCheck               int64           `gorm:"-" json:"is_check" form:"is_check"`
 }
 
 func (DoctorAdvice) TableName() string {

models/schedule_models.go

@@ -83,7 +83,7 @@ type WeekSchedule struct {
 	DeviceZone           DeviceZone       `json:"zone" gorm:"foreignkey:ID;AssociationForeignKey:PartitionId;"`
 	DeviceNumber         DeviceNumber     `json:"number" gorm:"foreignkey:ID;AssociationForeignKey:BedId;"`
 	DialysisPrescription DialysisSolution `json:"prescription" gorm:"foreignkey:PatientId,ModeId;AssociationForeignKey:PatientId,ModeId"`
-	DoctorAdvice         []*DoctorAdvice  `json:"doctor_advice" gorm:"foreignkey:PatientId;AssociationForeignKey:PatientId"`
+	DoctorAdvice         []*DoctorAdvice  `json:"doctor_advice" gorm:"-"`
 }
 
 func (WeekSchedule) TableName() string {

service/schedule_service.go

@@ -2,6 +2,10 @@ package service
 
 import (
 	"XT_New/models"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"
 
 	"github.com/jinzhu/gorm"
 )
@@ -227,15 +231,12 @@ func GetSchedualPatientsByKeywords(keywords string, org_id int64) (schedule []*m
 
 }
 
-func GetWeekDaySchedule(orgID int64, scheduleDate int64) (schedules []*models.WeekSchedule, err error) {
+func GetWeekDaySchedule(orgID int64, scheduleDate int64, scheduleDates *time.Time) (schedules []*models.WeekSchedule, err error) {
 
 	err = readDb.
 		Table("xt_schedule as s").
 		Preload("DeviceZone", "status = 1 ").
 		Preload("DeviceNumber", "status = 1 ").
-		Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND advice_type = 1").Preload("ChildDoctorAdvice", "status = 1")
-		}).
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1").Order("id desc")
 		}).
@@ -244,5 +245,106 @@ func GetWeekDaySchedule(orgID int64, scheduleDate int64) (schedules []*models.We
 		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("schedule_type").
 		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)
+				}
+			}
+			item.DoctorAdvice = append(item.DoctorAdvice, advice_three...)
+		}
+	}
+	return
+}
+
+func RemoveRepeatedElement(arr []*models.DoctorAdvice) (newArr []*models.DoctorAdvice) {
+	newArr = make([]*models.DoctorAdvice, 0)
+	for i := 0; i < len(arr); i++ {
+		repeat := false
+		for j := i + 1; j < len(arr); j++ {
+			if arr[i].ID == arr[j].ID {
+				repeat = true
+				break
+			}
+		}
+		if !repeat {
+			newArr = append(newArr, arr[i])
+		}
+	}
+	return
+}
+
+func GetLastLongAdviceByGroupNoOther(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 1  AND stop_state = 2 AND parent_id = 0", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	return
+}
+
+func GetLastLongAdviceByGroupNoThreeOther(orgId int64, patient_id int64) (advice []*models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ?  AND  advice_type = 1 AND frequency_type = 2 AND stop_state = 2 AND parent_id = 0 ", orgId, patient_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
+	return
+}
+
+func FindAllDoctorAdviceByTimeOther(now int64, end int64, patient_id int64, orgId int64, temp_id string) (advice []*models.DoctorAdvice, err error) {
+	err = readDb.Model(&models.DoctorAdvice{}).Where("status = 1 AND user_org_id = ? AND patient_id = ? AND advice_type = 2   AND frequency_type = 2 AND advice_date > ? AND advice_date < ? AND template_id = ?  ", orgId, patient_id, end, now, temp_id).Preload("ChildDoctorAdvice", "status = 1").Find(&advice).Error
 	return
 }