更新数据

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1739,8 +1739,8 @@ func (this *NewDialysisApiController) SaveBirthday() {
 
 func (this *NewDialysisApiController) GetOrgName() {
 
-	orgid := this.GetMobileAdminUserInfo().Org.Id
-	name, err := service.GetOrgName(orgid)
+	id, _ := this.GetInt64("id")
+	name, err := service.GetOrgName(id)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -1938,12 +1938,29 @@ func (this *NewDialysisApiController) GetAllNumber() {
 func (this *NewDialysisApiController) DeleteBed() {
 	id, _ := this.GetInt64("id")
 	fmt.Println("id", id)
-	err := service.DeleteBed(id)
-	fmt.Println("删除失败", err)
-	returnData := make(map[string]interface{}, 0)
-	returnData["msg"] = "删除失败"
-	this.ServeSuccessJSON(returnData)
-	return
+	nowDateTime := time.Now()
+	nowDate := nowDateTime.Format("2006-01-02")
+	nowDate += " 00:00:00"
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", nowDate, loc)
+	fmt.Println(theTime.Unix())
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgid := adminInfo.Org.Id
+	_, errcode := service.GetSchedu(id, theTime.Unix(), orgid)
+	fmt.Println("errcode ----------------", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		err := service.DeleteBed(id)
+		fmt.Println("删除失败", err)
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "删除失败"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else if errcode == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
 }
 
 func (this *NewDialysisApiController) LoginOut() {
@@ -2036,9 +2053,7 @@ func (this *NewDialysisApiController) GetMyOrganazition() {
 }
 
 func (this *NewDialysisApiController) GetOrgInformation() {
-
-	adminUser := this.GetMobileAdminUserInfo()
-	id := adminUser.Org.Id
+	id, _ := this.GetInt64("id")
 	information, err := service.GetOrgInformation(id)
 	name, err := service.GetShortName(information.OrgType)
 	typeName, err := service.GetTypeName(name.Pid)
@@ -2158,3 +2173,103 @@ func (this *NewDialysisApiController) GetMyInforName() {
 		"Username": Username,
 	})
 }
+
+func (this *NewDialysisApiController) GetPartionDetail() {
+	id, _ := this.GetInt64("id")
+	partionDetail, err := service.GetPartionDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"partionDetail": partionDetail,
+	})
+}
+
+func (this *NewDialysisApiController) UpdatePartition() {
+	id, _ := this.GetInt64("id")
+	name := this.GetString("name")
+	zoneType, _ := this.GetInt64("type")
+	strInt64 := strconv.FormatInt(zoneType, 10)
+	typeid, _ := strconv.Atoi(strInt64)
+	zone := models.DeviceZone{
+		Name: name,
+		Type: typeid,
+	}
+	err := service.UpdatePartition(id, &zone)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zone": zone,
+	})
+}
+
+func (this *NewDialysisApiController) GetGroupDetail() {
+	id, _ := this.GetInt64("id")
+	groupDetail, err := service.GetGroupDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"groupDetail": groupDetail,
+	})
+
+}
+
+func (this *NewDialysisApiController) UpdateGroup() {
+	id, _ := this.GetInt64("id")
+	name := this.GetString("name")
+	group := models.DeviceGroup{Name: name}
+	err := service.UpdateGroup(id, &group)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"group": group,
+	})
+}
+
+func (this *NewDialysisApiController) GetBedDetail() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
+	id, _ := this.GetInt64("id")
+	zone, _ := service.GetAllZoneOne(orgid)
+	group, err := service.GetAllGroupOne(orgid)
+	bedDetail, err := service.GetBedDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"zone":      zone,
+		"group":     group,
+		"bedDetail": bedDetail,
+	})
+}
+
+func (this *NewDialysisApiController) UpdatedBed() {
+	id, _ := this.GetInt64("id")
+	name := this.GetString("name")
+	fmt.Println("name", name)
+	zone, _ := this.GetInt64("zone")
+	fmt.Println("zone", zone)
+	group, _ := this.GetInt64("group")
+	fmt.Println("group", group)
+	number := models.DeviceNumber{
+		Number:  name,
+		ZoneID:  zone,
+		GroupID: group,
+	}
+	err := service.UpdatedBed(id, &number)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"number": number,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -135,4 +135,10 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getallorgtype", &NewDialysisApiController{}, "Get:GetAllOrgType")
 	beego.Router("/m/api/patient/editorg", &NewDialysisApiController{}, "Get:EditOrg")
 	beego.Router("/m/api/patient/getmyinforname", &NewDialysisApiController{}, "Get:GetMyInforName")
+	beego.Router("/m/api/patient/getpartiondetail", &NewDialysisApiController{}, "Get:GetPartionDetail")
+	beego.Router("/m/api/patient/updatepartition", &NewDialysisApiController{}, "Get:UpdatePartition")
+	beego.Router("/m/api/patient/getgroupdetail", &NewDialysisApiController{}, "Get:GetGroupDetail")
+	beego.Router("/m/api/patient/updategroup", &NewDialysisApiController{}, "Get:UpdateGroup")
+	beego.Router("/m/api/patient/getbeddetail", &NewDialysisApiController{}, "Get:GetBedDetail")
+	beego.Router("/m/api/patient/updatebed", &NewDialysisApiController{}, "Get:UpdatedBed")
 }

service/patientmanage_service.go

@@ -526,8 +526,8 @@ func GetNewDoctorAdviceOne(patientID int64, advice_type int64, start int64, end
 		db = db.Where("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("start_time desc").Scan(&doctoradvice).Error
-	fmt.Print("错误是什么东西", err)
+	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
+	fmt.Print("错误是什么", err)
 	return
 }
 
@@ -900,7 +900,7 @@ func DeleteChild(id int64) error {
 
 func DeletePatient(id int64) error {
 
-	err = XTWriteDB().Model(models.DoctorAdvice{}).Where("id=? and parent_id = ?", id, id).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	err = XTWriteDB().Model(models.DoctorAdvice{}).Where("id=? or parent_id = ?", id, id).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1118,6 +1118,19 @@ func GetAllNumber(page int64, limit int64, orgid int64) (number []*models.Device
 	return number, total, err
 }
 
+func GetSchedu(bedid int64, thetime int64, orgid int64) (*models.XtSchedule, error) {
+	schedule := models.XtSchedule{}
+	err := XTReadDB().Model(&schedule).Where("bed_id = ? and schedule_date = ? and user_org_id = ? and status = 1", bedid, thetime, orgid).Find(&schedule).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &schedule, nil
+
+}
+
 func DeleteBed(id int64) error {
 	err := XTWriteDB().Model(models.DeviceNumber{}).Where("id=?", id).Update(map[string]interface{}{"status": 0, "ctime": time.Now().Unix()}).Error
 	return err
@@ -1214,3 +1227,40 @@ func GetAdminName(id int64) (models.AdminUser, error) {
 	err := UserReadDB().Model(&user).Where("id=? and status =1", id).Find(&user).Error
 	return user, err
 }
+
+func GetPartionDetail(id int64) (models.DeviceZone, error) {
+
+	zone := models.DeviceZone{}
+	err := XTReadDB().Model(&zone).Where("id=? and status = 1", id).Find(&zone).Error
+	return zone, err
+}
+
+func UpdatePartition(id int64, zone *models.DeviceZone) error {
+
+	err := XTWriteDB().Model(&zone).Where("id=?", id).Update(map[string]interface{}{"name": zone.Name, "type": zone.Type, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetGroupDetail(id int64) (models.DeviceGroup, error) {
+	group := models.DeviceGroup{}
+	err := XTReadDB().Model(&group).Where("id=? and status = 1", id).Find(&group).Error
+	return group, err
+}
+
+func UpdateGroup(id int64, group *models.DeviceGroup) error {
+
+	err := XTWriteDB().Model(&group).Where("id=?", id).Update(map[string]interface{}{"name": group.Name, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetBedDetail(id int64) (models.DeviceNumber, error) {
+	number := models.DeviceNumber{}
+	err := XTReadDB().Model(&number).Where("id=? and status =1", id).Find(&number).Error
+	return number, err
+}
+
+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
+}