更新数据413

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -605,7 +605,7 @@ func (this *NewDialysisApiController) GetDoctorAdvices() {
 	fmt.Println("病人ID", newPatientInfo.BloodId)
 	advice, _, err := service.GetNewDoctorAdvice(newPatientInfo.BloodId, doctor_type, startime, endtime, limit, page, orgid)
 	one, total, err := service.GetNewDoctorAdviceOne(newPatientInfo.BloodId, doctor_type, startime, endtime, limit, page, orgid)
-	fmt.Print(one, total, err)
+	fmt.Println("err------------------------", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1948,7 +1948,7 @@ func (this *NewDialysisApiController) DeleteBed() {
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgid := adminInfo.Org.Id
 	_, errcode := service.GetSchedu(id, theTime.Unix(), orgid)
-	fmt.Println("errcode ----------------", errcode)
+	fmt.Println("errcode", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		err := service.DeleteBed(id)
 		fmt.Println("删除失败", err)
@@ -1967,6 +1967,19 @@ func (this *NewDialysisApiController) LoginOut() {
 
 	this.DelSession("mobile_admin_user_info")
 	this.Ctx.SetCookie("token_cookie", "")
+	id, _ := this.GetInt64("id")
+	fmt.Println("id------------------------------------------", id)
+	loginLog := models.SgjUserAdminLoginLog{
+		AdminUserId: id,
+		OrgId:       0,
+		AppId:       0,
+		Ip:          utils.GetIP(this.Ctx.Request),
+		OperateType: 2,
+		AppType:     0,
+		Ctime:       time.Now().Unix(),
+	}
+	err := service.CreateLoginLod(&loginLog)
+	fmt.Println("err--------", err)
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "删除失败"
 	this.ServeSuccessJSON(returnData)
@@ -2062,10 +2075,10 @@ func (this *NewDialysisApiController) GetOrgInformation() {
 	cityes, err := service.GetOrgProvince(information.City)
 	district, err := service.GetOrgProvince(information.District)
 	fmt.Print("err", err)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
-	}
+	//if err != nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	//	return
+	//}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"information": information,
 		"name":        name,

models/patient_models.go

@@ -797,3 +797,19 @@ func (XtPatients) TableName() string {
 
 	return "xt_patients"
 }
+
+type SgjUserAdminLoginLog struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId       int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId       int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	Ip          string `gorm:"column:ip" json:"ip" form:"ip"`
+	OperateType int64  `gorm:"column:operate_type" json:"operate_type" form:"operate_type"`
+	AppType     int64  `gorm:"column:app_type" json:"app_type" form:"app_type"`
+	Ctime       int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+}
+
+func (SgjUserAdminLoginLog) TableName() string {
+
+	return "sgj_user_admin_login_log"
+}

service/patientmanage_service.go

@@ -495,7 +495,7 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 		db = db.Where("x.start_time>=?", start)
 	}
 	if end > 0 {
-		db = db.Where("start_time<=?", end)
+		db = db.Where("x.start_time<=?", end)
 	}
 	//offset := (page - 1) * limit
 	err = db.Group("x.id").Count(&total).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&doctoradvice).Error
@@ -505,6 +505,7 @@ func GetNewDoctorAdvice(patientID int64, advice_type int64, start int64, end int
 }
 
 func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end int64, limit int64, page int64, orgID int64) (doctoradvice []*models.DoctorAdvice, total int64, err error) {
+	fmt.Println("advicetype------------------------------", advice_type)
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
 	table := UserReadDB().Table("sgj_user_admin_role as r")
 	fmt.Println("table", table)
@@ -523,10 +524,10 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 		db = db.Where("x.start_time>=?", start)
 	}
 	if end > 0 {
-		db = db.Where("start_time<=?", end)
+		db = db.Where("x.start_time<=?", end)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("x.start_time desc").Scan(&doctoradvice).Error
+	err = db.Order("x.start_time desc").Group("x.start_time").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Scan(&doctoradvice).Error
 	fmt.Print("错误是什么", err)
 	return
 }
@@ -881,14 +882,14 @@ func GetAllDoctorTwo(orgid int64, appid int64) (appRole []*models.SgjUserAdminRo
 func GetDoctorAdviceDetail(id int64, orgid int64) (advices []*models.DoctorAdvices, err error) {
 
 	db := XTReadDB().Table("xt_doctor_advice as x")
-	err = db.Order("x.id desc").Select("x.id,x.user_org_id,x.patient_id,x.advice_type,x.advice_date,x.start_time,x.advice_name,x.advice_desc,x.reminder_date,x.single_dose,x.single_dose_unit,x.prescribing_number,x.prescribing_number_unit,x.delivery_way,x.execution_frequency,x.advice_doctor,x.status,x.created_time,x.updated_time,x.advice_affirm,x.remark,x.stop_time,x.stop_reason,x.stop_doctor,x.stop_state,x.parent_id,x.execution_time,x.execution_staff,x.execution_state,x.checker,x.record_date,x.dialysis_order_id,x.check_time,x.check_state,x.drug_spec,x.drug_spec_unit,x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.template_id,x.modifier,s.name").Joins("left join xt_patients as s on s.id=x.patient_id").Where("x.groupno = ? and x.status = 1 and x.user_org_id = ?", id, orgid).Scan(&advices).Error
+	err = db.Order("x.id desc").Select("x.id,x.user_org_id,x.patient_id,x.advice_type,x.advice_date,x.start_time,x.advice_name,x.advice_desc,x.reminder_date,x.single_dose,x.single_dose_unit,x.prescribing_number,x.prescribing_number_unit,x.delivery_way,x.execution_frequency,x.advice_doctor,x.status,x.created_time,x.updated_time,x.advice_affirm,x.remark,x.stop_time,x.stop_reason,x.stop_doctor,x.stop_state,x.parent_id,x.execution_time,x.execution_staff,x.execution_state,x.checker,x.record_date,x.dialysis_order_id,x.check_time,x.check_state,x.drug_spec,x.drug_spec_unit,x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.template_id,x.modifier,s.name").Joins("left join xt_patients as s on s.id=x.patient_id").Where("x.start_time = ? and x.status = 1 and x.user_org_id = ?", id, orgid).Scan(&advices).Error
 
 	return advices, err
 }
 
 func DeleteManagement(groupid int64, orgid int64) error {
 
-	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("groupno=? and user_org_id = ?", groupid, orgid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("start_time =? and user_org_id = ?", groupid, orgid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1264,3 +1265,9 @@ func UpdatedBed(id int64, number *models.DeviceNumber) error {
 	err = XTWriteDB().Model(&number).Where("id=?", id).Update(map[string]interface{}{"number": number.Number, "zone_id": number.ZoneID, "group_id": number.GroupID, "mtime": time.Now().Unix()}).Error
 	return err
 }
+
+func CreateLoginLod(log *models.SgjUserAdminLoginLog) error {
+
+	err := UserWriteDB().Model(&log).Create(&log).Error
+	return err
+}