更新

controllers/admin_api_controllers/admin_api_base_controller.go

@@ -1,9 +1,9 @@
 package admin_api_controllers
 
 import (
-	"XT_New/controllers"
-	"XT_New/enums"
-	"XT_New/models/admin_models"
+	"XT/controllers"
+	"XT/enums"
+	"XT/models/admin_models"
 )
 
 type AdminBaseAPIController struct {

controllers/admin_api_controllers/analysis_api_controller.go

@@ -1,9 +1,9 @@
 package admin_api_controllers
 
 import (
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"time"
 )
 

controllers/admin_api_controllers/login_api_controller.go

@@ -1,8 +1,8 @@
 package admin_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
+	"XT/enums"
+	"XT/service"
 )
 
 type LoginAPIController struct {

controllers/base_api_controller.go

@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
+	"XT/enums"
+	"XT/service"
 )
 
 type BaseAPIController struct {

controllers/base_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"XT_New/service"
+	"XT/service"
 
 	"github.com/astaxie/beego"
 )

controllers/data_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"fmt"
 	"reflect"

controllers/device_api_controller.go

@@ -1,12 +1,12 @@
 package controllers
 
 import (
-	"XT_New/utils"
+	"XT/utils"
 	"time"
 
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 
 	"fmt"
 	"github.com/astaxie/beego"
@@ -42,6 +42,7 @@ func DeviceAPIControllerRegistRouters() {
 	beego.Router("/api/management/getallmachineinfo", &DeviceAPIController{}, "get:GetAllMachineInfo")
 	beego.Router("/api/management/getallmachine", &DeviceAPIController{}, "get:GetAllMachine")
 	beego.Router("/api/management/getmachinedetail", &DeviceAPIController{}, "get:GetMachineDetail")
+	beego.Router("/api/management/getallmachinetwo", &DeviceAPIController{}, "get:GetAllMachineTwo")
 }
 
 type DeviceAPIController struct {
@@ -1182,3 +1183,35 @@ func (this *DeviceAPIController) GetMachineDetail() {
 		//"zone":      zone,
 	})
 }
+
+func (this *DeviceAPIController) GetAllMachineTwo() {
+	adminUserInfo := this.GetAdminUserInfo()
+	orgid := adminUserInfo.CurrentOrgId
+	fmt.Println("机构id", orgid)
+	zoneid, _ := this.GetInt64("zoneid")
+	fmt.Println("zoneid", zoneid)
+	//number, err := service.GetZoneId(zoneid, orgid)
+	//classid, _ := this.GetInt64("classid")
+	//fmt.Println("classid", classid)
+	deviceid, _ := this.GetInt64("deviceid")
+	fmt.Println("deviceid", deviceid)
+	//now := time.Now()
+	//var week = int(now.Weekday())
+	//weeks := int64(week)
+	//fmt.Println("星期几",weeks)
+	timeStr := time.Now().Format("2006-01-02")
+	timeLayout := "2006-01-02 15:04:05"
+	fmt.Println("timeStr:", timeStr)
+	timeStringToTime, err := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+	timenow := timeStringToTime.Unix()
+	fmt.Println("timenow是什么", timenow)
+	fmt.Println("时间搓", timeStringToTime.Unix())
+	addmahcer, err := service.GetAllMachine(zoneid, 0, deviceid, timenow, orgid)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "查询设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"addmahcer": addmahcer,
+	})
+}

controllers/dialysis_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"fmt"
 	"github.com/jinzhu/gorm"

controllers/dialysis_board_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/service"
+	"XT/utils"
 	"time"
 
 	"github.com/astaxie/beego"

controllers/dialysis_record_api_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"encoding/json"
 	"github.com/jinzhu/gorm"
 	"math"
@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"XT_New/enums"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/service"
+	"XT/utils"
 
 	"fmt"
 	"github.com/astaxie/beego"
@@ -489,10 +489,10 @@ func (this *DialysisRecordAPIController) EditMonitor() {
 			MonitoringNurse:          adminUserInfo.AdminUser.Id,
 			Conductivity:             monitorParam.Conductivity,
 			DisplacementFlowQuantity: monitorParam.DisplacementFlowQuantity,
-			Status:                1,
-			CreatedTime:           time.Now().Unix(),
-			UpdatedTime:           time.Now().Unix(),
-			BloodOxygenSaturation: monitorParam.BloodOxygenSaturation,
+			Status:                   1,
+			CreatedTime:              time.Now().Unix(),
+			UpdatedTime:              time.Now().Unix(),
+			BloodOxygenSaturation:    monitorParam.BloodOxygenSaturation,
 		}
 		createErr := service.CreateMonitor(&monitor)
 		if createErr != nil {

controllers/district_api_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"XT_New/service"
+	"XT/service"
 
 	"github.com/astaxie/beego"
 )

controllers/doctors_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/service"
+	"XT/service"
 
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/jinzhu/gorm"

controllers/gobal_config_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"bytes"
 	"encoding/json"
 	"fmt"

controllers/inspection_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"

controllers/integration_config_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 	"github.com/astaxie/beego"
 	"time"
 )
@@ -89,31 +89,31 @@ func (c *IntegrationConfigApiController) CreatePatientHis() {
 	}
 
 	hisPatient := &models.HisPatients{
-		UserOrgId:          adminUserInfo.CurrentOrgId,
-		UserId:             patient.UserId,
-		Avatar:             patient.Avatar,
-		PatientType:        patient.PatientType,
-		DialysisNo:         patient.DialysisNo,
-		AdmissionNumber:    patient.AdmissionNumber,
-		Source:             patient.Source,
-		Lapseto:            patient.Lapseto,
-		PartitionId:        patient.PartitionId,
-		BedId:              patient.BedId,
-		Name:               patient.Name,
-		Alias:              patient.Alias,
-		Gender:             patient.Gender,
-		Nation:             patient.Nation,
-		NativePlace:        patient.NativePlace,
-		MaritalStatus:      patient.MaritalStatus,
-		IdCardNo:           patient.IdCardNo,
-		Birthday:           patient.Birthday,
-		ReimbursementWayId: patient.ReimbursementWayId,
-		HealthCareType:     patient.HealthCareType,
-		HealthCareNo:       patient.HealthCareNo,
-		HealthCareDueDate:  patient.HealthCareDueDate,
-		Height:             patient.Height,
-		BloodType:          patient.BloodType,
-		Rh:                 patient.Rh,
+		UserOrgId:                    adminUserInfo.CurrentOrgId,
+		UserId:                       patient.UserId,
+		Avatar:                       patient.Avatar,
+		PatientType:                  patient.PatientType,
+		DialysisNo:                   patient.DialysisNo,
+		AdmissionNumber:              patient.AdmissionNumber,
+		Source:                       patient.Source,
+		Lapseto:                      patient.Lapseto,
+		PartitionId:                  patient.PartitionId,
+		BedId:                        patient.BedId,
+		Name:                         patient.Name,
+		Alias:                        patient.Alias,
+		Gender:                       patient.Gender,
+		Nation:                       patient.Nation,
+		NativePlace:                  patient.NativePlace,
+		MaritalStatus:                patient.MaritalStatus,
+		IdCardNo:                     patient.IdCardNo,
+		Birthday:                     patient.Birthday,
+		ReimbursementWayId:           patient.ReimbursementWayId,
+		HealthCareType:               patient.HealthCareType,
+		HealthCareNo:                 patient.HealthCareNo,
+		HealthCareDueDate:            patient.HealthCareDueDate,
+		Height:                       patient.Height,
+		BloodType:                    patient.BloodType,
+		Rh:                           patient.Rh,
 		HealthCareDueAlertDate:       patient.HealthCareDueAlertDate,
 		EducationLevel:               patient.EducationLevel,
 		Profession:                   patient.Profession,
@@ -155,18 +155,18 @@ func (c *IntegrationConfigApiController) CreatePatientHis() {
 		CreatedTime:                  time.Now().Unix(),
 		UpdatedTime:                  time.Now().Unix(),
 		Age:                          patient.Age,
-		InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
-		IsInfectious:             patient.IsInfectious,
-		RemindCycle:              patient.RemindCycle,
-		ResponseResult:           patient.ResponseResult,
-		IsOpenRemind:             patient.IsOpenRemind,
-		DialysisAge:              patient.DialysisAge,
-		ExpenseKind:              patient.ExpenseKind,
-		TellPhone:                patient.TellPhone,
-		FirstTreatmentDate:       patient.FirstTreatmentDate,
-		ContactName:              patient.ContactName,
-		HisUserId:                his_user_id,
-		XtPatientId:              patient.ID,
+		InfectiousNextRecordTime:     patient.InfectiousNextRecordTime,
+		IsInfectious:                 patient.IsInfectious,
+		RemindCycle:                  patient.RemindCycle,
+		ResponseResult:               patient.ResponseResult,
+		IsOpenRemind:                 patient.IsOpenRemind,
+		DialysisAge:                  patient.DialysisAge,
+		ExpenseKind:                  patient.ExpenseKind,
+		TellPhone:                    patient.TellPhone,
+		FirstTreatmentDate:           patient.FirstTreatmentDate,
+		ContactName:                  patient.ContactName,
+		HisUserId:                    his_user_id,
+		XtPatientId:                  patient.ID,
 	}
 
 	err := service.CreatePatientsHis(hisPatient)

controllers/invoice_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"

controllers/manage_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
@@ -90,6 +90,8 @@ func ManageRouters() {
 	beego.Router("/api/manage/deletemode", &MachineApiController{}, "delete:DeleteMode")
 	beego.Router("/api/manage/selectchange", &MachineApiController{}, "Get:SelectChange")
 	beego.Router("/api/manage/selectbed", &MachineApiController{}, "get:SelectBed")
+	beego.Router("/api/manage/getime", &MachineApiController{}, "get:GetTimeData")
+	beego.Router("/api/manage/deleteimages", &MachineApiController{}, "delete:DeleteImages")
 }
 
 func (this *MachineApiController) SaveManageInfo() {
@@ -285,6 +287,7 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	unittype := int64(dataBody["unit_type"].(float64))
 	unit_type := strconv.FormatInt(unittype, 10)
 	fmt.Println("设备型号", unit_type)
+
 	use_section := dataBody["use_section"].(string)
 	//fmt.Println("使用科室", use_section)
 	section_number := dataBody["section_number"].(string)
@@ -349,6 +352,7 @@ func (this *MachineApiController) UpdateMachineInfo() {
 		ids = append(ids, id)
 	}
 	fmt.Println("ids", ids)
+	//service.GetModeName(unit_type)
 	addmacher := models.DeviceAddmacher{
 		ID:                  id,
 		SerialNumber:        serial_number,
@@ -481,6 +485,7 @@ func (this *MachineApiController) UpdateMachinetwo() {
 	revers_modes := int64(dataBody["revers_mode"].(float64))
 
 	addmacher := models.DeviceAddmacher{
+		ID:                  id,
 		SerialNumber:        serial_number,
 		DeviceType:          device_type,
 		BedNumber:           bed_nunmber,
@@ -608,6 +613,7 @@ func (this *MachineApiController) Updatemacheinetwo() {
 	work_time := dataBody["work_time"].(string)
 	//fmt.Println("工作时长", work_time)
 	addmacher := models.DeviceAddmacher{
+		ID:                  id,
 		SerialNumber:        serial_number,
 		DeviceType:          device_type,
 		BedNumber:           bednumber,
@@ -705,7 +711,7 @@ func (this *MachineApiController) SavePlan() {
 	//fmt.Println("液路消毒液", disinfectant)
 	bed, err := service.GetBed(id)
 	_, errcode := service.QueryPlan(orgid, device_type, ids, classids, id)
-	//fmt.Println("errcode", errcode)
+	fmt.Print("errcode ---------", errcode)
 	if errcode == gorm.ErrRecordNotFound {
 		err = service.AddPlan(orgid, device_type, disinfec_time, ids, classids, way, machinedisinfectant, disinfectantway, disinfectant, id, bed.BedId)
 		if err != nil {
@@ -990,6 +996,7 @@ func (this *MachineApiController) GetAllOrganization() {
 
 func (this *MachineApiController) SaveInformation() {
 	eid, _ := this.GetInt64("eid")
+	fmt.Print("eid-------", eid)
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
 	//fmt.Println("错误是", err)
@@ -997,7 +1004,7 @@ func (this *MachineApiController) SaveInformation() {
 	orgid := adminUserInfo.CurrentOrgId
 
 	id := int64(dataBody["id"].(float64))
-	//fmt.Println("id", id)
+	fmt.Println("id", id)
 
 	date := dataBody["date"].(string)
 	timeLayout := "2006-01-02"
@@ -1134,43 +1141,43 @@ func (this *MachineApiController) SaveInformation() {
 	sign_name := int64(dataBody["sign_name"].(float64))
 	//fmt.Println("签名", sign_name)
 
-	information, errinfor := service.GetInformation(id, orgid)
-	//fmt.Print("errinfor", errinfor)
+	information, errinfor := service.GetInformation(eid, startdate, orgid)
+	fmt.Print("errinfor---------------------", errinfor)
 	fmt.Print("information", information)
 	if errinfor == gorm.ErrRecordNotFound {
 		infor := models.DeviceInformation{
-			Date:                startdate,
-			Class:               classtype,
-			Zone:                zone,
-			BedNumber:           bednumber,
-			PatientId:           patient_time,
-			Contagion:           contagion,
-			DialysisMode:        dialysis_mode,
-			StartTime:           startDate.Unix(),
-			EndTime:             endDate.Unix(),
-			DialysisHour:        dialysis_time,
-			Hyperfiltratio:      hyperfiletration,
-			WeightLoss:          weight_loss,
-			WarningValue:        warining_value,
-			UserTotal:           user_total,
-			Move:                run,
-			FailureStage:        failure_stage,
-			FaultDescription:    falult_desciription,
-			CodeInformation:     code_information,
-			DisinfectantType:    disinfectant_type,
-			DisinfectType:       disinfect_type,
-			Disinfection:        disinfection,
-			MachineRun:          machine_run,
-			FluidPath:           fluid_path,
-			Disinfectant:        disinfectant,
-			DisinfectionStatus:  disinfection_status,
-			DisinfectionResidue: disinfection_residue,
-			LongTime:            longtime,
-			DisinfecStartime:    start_Date.Unix(),
-			DisinfecEndtime:     end_Date.Unix(),
-			DialysisChecked:     dialysis_checked,
-			DialysisName:        dialysis_name,
-			Norms:               norms,
+			Date:                  startdate,
+			Class:                 classtype,
+			Zone:                  zone,
+			BedNumber:             bednumber,
+			PatientId:             patient_time,
+			Contagion:             contagion,
+			DialysisMode:          dialysis_mode,
+			StartTime:             startDate.Unix(),
+			EndTime:               endDate.Unix(),
+			DialysisHour:          dialysis_time,
+			Hyperfiltratio:        hyperfiletration,
+			WeightLoss:            weight_loss,
+			WarningValue:          warining_value,
+			UserTotal:             user_total,
+			Move:                  run,
+			FailureStage:          failure_stage,
+			FaultDescription:      falult_desciription,
+			CodeInformation:       code_information,
+			DisinfectantType:      disinfectant_type,
+			DisinfectType:         disinfect_type,
+			Disinfection:          disinfection,
+			MachineRun:            machine_run,
+			FluidPath:             fluid_path,
+			Disinfectant:          disinfectant,
+			DisinfectionStatus:    disinfection_status,
+			DisinfectionResidue:   disinfection_residue,
+			LongTime:              longtime,
+			DisinfecStartime:      start_Date.Unix(),
+			DisinfecEndtime:       end_Date.Unix(),
+			DialysisChecked:       dialysis_checked,
+			DialysisName:          dialysis_name,
+			Norms:                 norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -1191,38 +1198,38 @@ func (this *MachineApiController) SaveInformation() {
 		})
 	} else if errinfor == nil {
 		infor := models.DeviceInformation{
-			Date:                startdate,
-			Class:               classtype,
-			Zone:                zone,
-			BedNumber:           bednumber,
-			PatientId:           patient_time,
-			Contagion:           contagion,
-			DialysisMode:        dialysis_mode,
-			StartTime:           startDate.Unix(),
-			EndTime:             endDate.Unix(),
-			DialysisHour:        dialysis_time,
-			Hyperfiltratio:      hyperfiletration,
-			WeightLoss:          weight_loss,
-			WarningValue:        warining_value,
-			UserTotal:           user_total,
-			Move:                run,
-			FailureStage:        failure_stage,
-			FaultDescription:    falult_desciription,
-			CodeInformation:     code_information,
-			DisinfectantType:    disinfectant_type,
-			DisinfectType:       disinfect_type,
-			Disinfection:        disinfection,
-			MachineRun:          machine_run,
-			FluidPath:           fluid_path,
-			Disinfectant:        disinfectant,
-			DisinfectionStatus:  disinfection_status,
-			DisinfectionResidue: disinfection_residue,
-			LongTime:            longtime,
-			DisinfecStartime:    start_Date.Unix(),
-			DisinfecEndtime:     end_Date.Unix(),
-			DialysisChecked:     dialysis_checked,
-			DialysisName:        dialysis_name,
-			Norms:               norms,
+			Date:                  startdate,
+			Class:                 classtype,
+			Zone:                  zone,
+			BedNumber:             bednumber,
+			PatientId:             patient_time,
+			Contagion:             contagion,
+			DialysisMode:          dialysis_mode,
+			StartTime:             startDate.Unix(),
+			EndTime:               endDate.Unix(),
+			DialysisHour:          dialysis_time,
+			Hyperfiltratio:        hyperfiletration,
+			WeightLoss:            weight_loss,
+			WarningValue:          warining_value,
+			UserTotal:             user_total,
+			Move:                  run,
+			FailureStage:          failure_stage,
+			FaultDescription:      falult_desciription,
+			CodeInformation:       code_information,
+			DisinfectantType:      disinfectant_type,
+			DisinfectType:         disinfect_type,
+			Disinfection:          disinfection,
+			MachineRun:            machine_run,
+			FluidPath:             fluid_path,
+			Disinfectant:          disinfectant,
+			DisinfectionStatus:    disinfection_status,
+			DisinfectionResidue:   disinfection_residue,
+			LongTime:              longtime,
+			DisinfecStartime:      start_Date.Unix(),
+			DisinfecEndtime:       end_Date.Unix(),
+			DialysisChecked:       dialysis_checked,
+			DialysisName:          dialysis_name,
+			Norms:                 norms,
 			DialysisConcentration: dialysis_concentration,
 			GermChecked:           germ_checked,
 			GermName:              germ_name,
@@ -1235,7 +1242,9 @@ func (this *MachineApiController) SaveInformation() {
 			EquimentId:            eid,
 			Bed:                   number.Number,
 		}
-		errors := service.UpadateForm(id, orgid, &infor)
+		informationdata, err := service.GetLastInformationdata(eid, startdate, orgid)
+		fmt.Print("informationdata----", informationdata.ID)
+		errors := service.UpadateForm(informationdata.ID, orgid, &infor)
 		//fmt.Print("报错", errors)
 		if errors != nil {
 			this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
@@ -2358,37 +2367,37 @@ func (this *MachineApiController) UpdateForm() {
 	fmt.Println("签名", sign_name)
 
 	information := models.DeviceInformation{
-		Date:                startdate,
-		Class:               classtype,
-		Zone:                zone,
-		BedNumber:           bednumber,
-		Contagion:           contagion,
-		DialysisMode:        dialysis_mode,
-		StartTime:           startDate.Unix(),
-		EndTime:             endDate.Unix(),
-		DialysisHour:        dialysis_time,
-		Hyperfiltratio:      hyperfiletration,
-		WeightLoss:          weight_loss,
-		WarningValue:        warining_value,
-		UserTotal:           user_total,
-		Move:                run,
-		FailureStage:        failure_stage,
-		FaultDescription:    falult_desciription,
-		CodeInformation:     code_information,
-		DisinfectantType:    disinfectant_type,
-		DisinfectType:       disinfect_type,
-		Disinfection:        disinfection,
-		MachineRun:          machine_run,
-		FluidPath:           fluid_path,
-		Disinfectant:        disinfectant,
-		DisinfectionStatus:  disinfection_status,
-		DisinfectionResidue: disinfection_residue,
-		LongTime:            longtime,
-		DisinfecStartime:    distartime,
-		DisinfecEndtime:     diendtime,
-		DialysisChecked:     dialysis_checked,
-		DialysisName:        dialysis_name,
-		Norms:               norms,
+		Date:                  startdate,
+		Class:                 classtype,
+		Zone:                  zone,
+		BedNumber:             bednumber,
+		Contagion:             contagion,
+		DialysisMode:          dialysis_mode,
+		StartTime:             startDate.Unix(),
+		EndTime:               endDate.Unix(),
+		DialysisHour:          dialysis_time,
+		Hyperfiltratio:        hyperfiletration,
+		WeightLoss:            weight_loss,
+		WarningValue:          warining_value,
+		UserTotal:             user_total,
+		Move:                  run,
+		FailureStage:          failure_stage,
+		FaultDescription:      falult_desciription,
+		CodeInformation:       code_information,
+		DisinfectantType:      disinfectant_type,
+		DisinfectType:         disinfect_type,
+		Disinfection:          disinfection,
+		MachineRun:            machine_run,
+		FluidPath:             fluid_path,
+		Disinfectant:          disinfectant,
+		DisinfectionStatus:    disinfection_status,
+		DisinfectionResidue:   disinfection_residue,
+		LongTime:              longtime,
+		DisinfecStartime:      distartime,
+		DisinfecEndtime:       diendtime,
+		DialysisChecked:       dialysis_checked,
+		DialysisName:          dialysis_name,
+		Norms:                 norms,
 		DialysisConcentration: dialysis_concentration,
 		GermChecked:           germ_checked,
 		GermName:              germ_name,
@@ -2529,7 +2538,8 @@ func (this *MachineApiController) GetBedForm() {
 func (this *MachineApiController) GetTotalCount() {
 	info := this.GetAdminUserInfo()
 	orgid := info.CurrentOrgId
-	total, err := service.GetTotalCount(orgid)
+	_, total, err := service.GetTotalCount(orgid)
+	fmt.Print("------------------------------声优", err)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")
 		return
@@ -2998,3 +3008,42 @@ func (this *MachineApiController) SelectBed() {
 		"zone": bed,
 	})
 }
+
+func (this *MachineApiController) GetTimeData() {
+	equitid, _ := this.GetInt64("equitid")
+	fmt.Print("equitid", equitid)
+	timeLayout := "2006-01-02 15:04:05"
+	todaytime := this.GetString("todaytime")
+	theTime, _ := utils.ParseTimeStringToTime(timeLayout, todaytime+" 00:00:00")
+	fmt.Print("时间", theTime.Unix())
+	adminUserInfo := this.GetAdminUserInfo()
+	orgid := adminUserInfo.CurrentOrgId
+	timeData, err := service.GetTimeData(equitid, orgid, theTime.Unix())
+	fmt.Print("报错----------------", err)
+	timeDataTwo, err := service.GetTimeTwo(equitid, orgid, theTime.Unix())
+	timeDataThree, err := service.GetTimeThree(equitid, orgid, theTime.Unix())
+	fmt.Print("err报错了没有-------------------------------", err)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"timeData":      timeData,
+		"timeDataTwo":   timeDataTwo,
+		"timeDataThree": timeDataThree,
+	})
+}
+
+func (this *MachineApiController) DeleteImages() {
+	id, _ := this.GetInt64("id")
+	err := service.DeleteImages(id)
+	fmt.Print("err========", err)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除失败")
+		return
+	}
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}

controllers/mobile_api_controllers/admin_user_api_controller.go

@@ -1,9 +1,9 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 	"encoding/json"
 	"fmt"
 	"time"

controllers/mobile_api_controllers/check_api_controller.go

@@ -1,9 +1,9 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 	"time"
 )
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -1,10 +1,10 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	_ "XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	_ "XT/utils"
 	_ "encoding/json"
 	"fmt"
 	_ "github.com/astaxie/beego"

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -10,10 +10,10 @@ import (
 	"strings"
 	"time"
 
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"math"
 )
 

controllers/mobile_api_controllers/dialysis_api_controller_extend.go

@@ -1,10 +1,10 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"time"

controllers/mobile_api_controllers/doctor_advice_api_controller.go

@@ -1,10 +1,10 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 )
 
 type DoctorAdviceAPIController struct {

controllers/mobile_api_controllers/doctor_api_controller.go

@@ -1,7 +1,7 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/service"
+	"XT/service"
 )
 
 type DoctorsApiController struct {

controllers/mobile_api_controllers/login_api_controller.go

@@ -6,10 +6,10 @@ import (
 	"net/http"
 	"net/url"
 
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 
 	"github.com/astaxie/beego"
 )

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -1,10 +1,10 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/controllers"
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/controllers"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 )
 
 type MobileBaseAPIController struct {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1,10 +1,10 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"fmt"
 	"strings"

controllers/mobile_api_controllers/qiniiu_api_controller.go

@@ -1,8 +1,8 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
+	"XT/enums"
+	"XT/service"
 	"fmt"
 )
 

controllers/mobile_api_controllers/stock_api_controller.go

@@ -1,8 +1,8 @@
 package mobile_api_controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
+	"XT/enums"
+	"XT/service"
 	"github.com/astaxie/beego"
 )
 

controllers/orginfo_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"reflect"
 	"time"

controllers/patient_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"reflect"
 	"strconv"

controllers/patient_dataconfig_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"strconv"
 	"strings"
 	"time"

controllers/pay_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 	"bytes"
 	"crypto/md5"
 	"encoding/hex"

controllers/print_data_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	service "XT_New/service/print_data_service/schedule_dialysis"
-	"XT_New/utils"
+	"XT/enums"
+	service "XT/service/print_data_service/schedule_dialysis"
+	"XT/utils"
 	"fmt"
 	"strings"
 	"time"

controllers/public_api_controller.go

@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
+	"XT/enums"
+	"XT/service"
 	"encoding/json"
 	"fmt"
 	"strings"

controllers/qcd_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/service"
+	"XT/utils"
 	"time"
 
 	"github.com/astaxie/beego"

controllers/qiniiu_api_controller.go

@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/service"
+	"XT/enums"
+	"XT/service"
 	"fmt"
 
 	"github.com/astaxie/beego"
@@ -22,7 +22,7 @@ func (c *QiNiuApiController) GetQNUpToken() {
 	defer redisClient.Close()
 
 	token, err := redisClient.Get("qn_token").Result()
-
+	fmt.Print("token------------------------------------", token)
 	if err != nil {
 		defer fmt.Println(err)
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeGetQiniuUpToken)

controllers/role_controller.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 
 	"github.com/astaxie/beego"
 )

controllers/schedule_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"fmt"
 	"reflect"

controllers/schedule_template_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"time"
 

controllers/sign_weigh_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"

controllers/statistics_api_controller.go

@@ -1,7 +1,7 @@
 package controllers
 
 import (
-	"XT_New/service"
+	"XT/service"
 	"github.com/astaxie/beego"
 	"time"
 )

controllers/stock_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"github.com/astaxie/beego"
 	"strconv"
 	"time"

controllers/stock_good_api_controller.go

@@ -1,9 +1,9 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
 	"fmt"
 	"github.com/astaxie/beego"
 	"strconv"

controllers/stock_in_api_controller.go

@@ -1,10 +1,10 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/models"
+	"XT/service"
+	"XT/utils"
 	"encoding/json"
 	"fmt"
 	"github.com/astaxie/beego"
@@ -1376,7 +1376,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				} else {
 					warehouseOutInfo := &models.WarehouseOutInfo{
-						ID: id,
+						ID:                      id,
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 						WarehouseOutId:          warehouseOut.ID,
 						GoodId:                  good_id,

controllers/verify_login_controller.go

@@ -1,13 +1,13 @@
 package controllers
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"net/url"
 
-	"XT_New/enums"
-	"XT_New/service"
-	"XT_New/utils"
+	"XT/enums"
+	"XT/service"
+	"XT/utils"
 
 	"github.com/astaxie/beego"
 )

service/admin_service.go

@@ -3,8 +3,8 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/models/admin_models"
+	"XT/models"
+	"XT/models/admin_models"
 	"time"
 
 	"github.com/jinzhu/gorm"

service/app_version.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"github.com/jinzhu/gorm"
 )
 

service/auto_clear_schedules_service.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 	"time"
 
 	"github.com/robfig/cron"

service/auto_create_week_disinfection.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"github.com/robfig/cron"

service/auto_create_week_plan.go

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"github.com/robfig/cron"

service/auto_create_week_schedules_service.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 
 	"github.com/jinzhu/gorm"
 	"github.com/robfig/cron"

service/data.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	_ "github.com/astaxie/beego"
 	_ "strconv"
 	_ "strings"

service/db_err_service.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 )
 
 func CreateDBErrorRecord(orgID int64, decsFormat string, v ...interface{}) {

service/device_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strings"

service/dialysis_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"time"
 

service/doctor_advice_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"strings"
 	"time"
 

service/gobal_config_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"github.com/jinzhu/gorm"
 )
 

service/inspection_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"errors"
 	"strings"
 	"time"

service/integration_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"github.com/jinzhu/gorm"
 	"time"
 )

service/invoice_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"github.com/jinzhu/gorm"
 	"strconv"
 )

service/manage_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strings"
@@ -107,17 +107,37 @@ func QueryPlan(orgid int64, devicetype int64, ids []int64, classids []int64, equ
 
 	var pre models.DevicePlan
 	var err error
-	for _, id := range ids {
-		for _, classids := range classids {
-			err = UserReadDB().Model(&pre).Where("user_org_id = ? AND device_type = ? AND time = ? AND classtime = ? AND equiment_id = ? AND status = 1", orgid, devicetype, id, classids, equitid).Find(&pre).Error
+	//for _, id := range ids {
+	//	for _, classids := range classids {
+	//		err = UserReadDB().Model(&pre).Where("user_org_id = ? AND device_type = ? AND time = ? AND classtime = ? AND equiment_id = ? AND status = 1", orgid, devicetype, id, classids, equitid).Find(&pre).Error
+	//	}
+	//}
+	//if err == gorm.ErrRecordNotFound {
+	//	return nil, err
+	//}
+	//if err != nil {
+	//	return nil, err
+	//}
+	//return &pre, nil
+
+	if len(ids) == 1 && len(classids) == 1 {
+		err = UserWriteDB().Model(&models.DevicePlan{}).Where("user_org_id = ? and device_type = ? and  time = ? and classtime = ?  and status = 1 ", orgid, devicetype, ids[0], classids[0]).Find(&pre).Error
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		}
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		err = UserWriteDB().Model(models.DevicePlan{}).Where("time IN(?) and user_org_id = ? and device_type = ? AND classtime IN(?) and status = 1", ids, orgid, devicetype, classids).Find(&pre).Error
+		if err == gorm.ErrRecordNotFound {
+			return nil, err
+		}
+		if err != nil {
+			return nil, err
 		}
 	}
-	if err == gorm.ErrRecordNotFound {
-		return nil, err
-	}
-	if err != nil {
-		return nil, err
-	}
+
 	return &pre, nil
 }
 
@@ -266,7 +286,7 @@ func GetComprehensive(zone int64, number int64, devicetype int64, year int64, st
 	if endtime > 0 {
 		db = db.Where("a.ctime <= ?", endtime)
 	}
-	err = db.Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.zone_id,a.bed_id,x.name").Joins("Left JOIN sgj_xt.xt_device_zone as x On x.id = a.zone_id").Scan(&macher).Error
+	err = db.Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.zone_id,a.bed_id,x.name,m.device_mode").Joins("Left JOIN sgj_xt.xt_device_zone as x On x.id = a.zone_id").Joins("Left JOIN xt_device_mode as m on m.id = a.unit_type").Scan(&macher).Error
 	return macher, err
 }
 
@@ -700,6 +720,12 @@ func DeleteForm(orgid int64, ids []int64) (err error) {
 	return
 }
 
+func GetLastInformationdata(eid int64, startdate int64, orgid int64) (models.DeviceInformation, error) {
+	information := models.DeviceInformation{}
+	err := UserReadDB().Model(&information).Where("equiment_id = ? and date = ? and user_org_id = ? and status = 1", eid, startdate, orgid).Last(&information).Error
+	return information, err
+}
+
 func UpadateForm(id int64, orgid int64, infor *models.DeviceInformation) error {
 
 	err := UserWriteDB().Model(&infor).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"date": infor.Date, "class": infor.Class, "zone": infor.Zone, "bed_number": infor.BedNumber, "contagion": infor.Contagion, "dialysis_mode": infor.DialysisMode, "start_time": infor.StartTime, "end_time": infor.EndTime, "dialysis_hour": infor.DialysisHour, "hyperfiltratio": infor.Hyperfiltratio, "weight_loss": infor.WeightLoss, "warning_value": infor.WarningValue, "user_total": infor.UserTotal, "move": infor.Move, "failure_stage": infor.FailureStage, "fault_description": infor.FaultDescription, "code_information": infor.CodeInformation, "disinfect_type": infor.DisinfectType, "disinfectant_type": infor.DisinfectType, "disinfection": infor.Disinfection, "machine_run": infor.MachineRun, "fluid_path": infor.FluidPath, "disinfectant": infor.Disinfectant, "disinfection_status": infor.DisinfectionStatus, "disinfection_residue": infor.DisinfectionResidue, "long_time": infor.LongTime, "disinfec_startime": infor.DisinfecStartime, "disinfec_endtime": infor.DisinfecEndtime, "dialysis_checked": infor.DialysisChecked, "dialysis_name": infor.DialysisName, "norms": infor.Norms, "dialysis_concentration": infor.DialysisConcentration,
@@ -818,10 +844,9 @@ func GetBedForm(id int64) (number []*models.DeviceNumber, err error) {
 	return number, err
 }
 
-func GetTotalCount(orgid int64) (total int64, err error) {
-	repair := models.DeviceRepair{}
-	err = UserReadDB().Model(&repair).Where("user_org_id = ?", orgid).Count(&total).Error
-	return total, err
+func GetTotalCount(orgid int64) (repair []*models.DeviceRepair, total int64, err error) {
+	err = UserReadDB().Model(&repair).Where("user_org_id = ? and status = 1", orgid).Find(&repair).Count(&total).Error
+	return repair, total, err
 }
 
 func GetTotalNumber(id int64, orgid int64) (total int64, err error) {
@@ -856,10 +881,24 @@ func GetAllpatient(orgid int64) (patients []*models.Patients, err error) {
 	return patients, err
 }
 
-func GetInformation(id int64, orgid int64) (*models.DeviceInformation, error) {
+//func GetInformation(id int64, orgid int64) (*models.DeviceInformation, error) {
+////	var information models.DeviceInformation
+////	var err error
+////	err = UserReadDB().Model(&information).Where("id = ? and user_org_id = ? and status = ?", id, orgid, 1).Find(&information).Error
+////	fmt.Print("", err)
+////	if err == gorm.ErrRecordNotFound {
+////		return nil, err
+////	}
+////	if err != nil {
+////		return nil, err
+////	}
+////	return &information, nil
+////}
+
+func GetInformation(eid int64, startdate int64, orgid int64) (*models.DeviceInformation, error) {
 	var information models.DeviceInformation
 	var err error
-	err = UserReadDB().Model(&information).Where("id = ? and user_org_id = ? and status = ?", id, orgid, 1).Find(&information).Error
+	err = UserReadDB().Model(&information).Where("equiment_id = ? and user_org_id = ? and status = ? and date = ? ", eid, orgid, 1, startdate).Find(&information).Error
 	fmt.Print("", err)
 	if err == gorm.ErrRecordNotFound {
 		return nil, err
@@ -968,3 +1007,40 @@ func SelectBed(id int64, orgid int64) (models.DeviceNumber, error) {
 	err := XTReadDB().Where("id = ? and org_id = ?", id, orgid).Find(&number).Error
 	return number, err
 }
+
+func GetTimeData(equitid int64, orgid int64, timenow int64) (information []*models.DeviceInformation, err error) {
+	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
+	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
+	day := time.Now().Day()
+	oldMonth := day - 30
+	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
+
+	err = UserReadDB().Model(&information).Where("date>= ? and date <= ? and equiment_id = ? and user_org_id = ? and dialysis_checked = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error
+	return information, err
+}
+
+func GetTimeTwo(equitid int64, orgid int64, timenow int64) (information []*models.DeviceInformation, err error) {
+	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
+	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
+	day := time.Now().Day()
+	oldMonth := day - 30
+	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
+	err = UserReadDB().Model(&information).Where("date >= ? and date<= ? and equiment_id = ? and user_org_id = ? and germ_checked = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error
+	return information, err
+}
+
+func GetTimeThree(equitid int64, orgid int64, timenow int64) (information []*models.DeviceInformation, err error) {
+	//db := UserReadDB().Table("xt_device_information as x").Where("x.status = 1")
+	//err = db.Raw("select id,date,class,zone,bed_number,patient_id,contagion,dialysis_mode,start_time,end_time,dialysis_hour,hyperfiltratio,weight_loss,warning_value,user_total,move,failure_stage,fault_description,code_information,disinfect_type,disinfectant_type,disinfection,machine_run,fluid_path,disinfectant,disinfection_status,disinfection_residue,long_time,disinfec_startime,disinfec_endtime,dialysis_checked,dialysis_name,norms,dialysis_concentration,germ_checked,germ_name,germ_number,clean,sign_name,status,ctime,mtime,user_org_id,equiment_id,bed,stime from xt_device_information where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= ? and equiment_id = ? and user_org_id = ?",timenow,equitid, orgid).Error
+	day := time.Now().Day()
+	oldMonth := day - 30
+	t := time.Date(time.Now().Year(), time.Now().Month(), oldMonth, time.Now().Hour(), time.Now().Minute(), time.Now().Second(), time.Now().Nanosecond(), time.Local)
+	err = UserReadDB().Model(&information).Where("date >= ? and date <= ?  and equiment_id = ? and user_org_id = ? and clean = 1 ", t.Unix(), timenow, equitid, orgid).Find(&information).Error
+	return information, err
+}
+
+func DeleteImages(id int64) error {
+	repair := models.DeviceRepair{}
+	err := UserWriteDB().Model(&repair).Where("id=?", id).Update(map[string]interface{}{"images": "", "image_name": ""}).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"time"

service/orginfo_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"time"
 )
 

service/patient_dataconfig_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"time"
 
 	"github.com/jinzhu/gorm"

service/patient_schedule_template_service.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 
 	"github.com/jinzhu/gorm"
 )

service/patient_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"strconv"
 	"strings"
 	"time"

service/pay_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"github.com/jinzhu/gorm"
 	"strconv"
 	"time"

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -1,9 +1,9 @@
 package schedule_dialysis
 
 import (
-	"XT_New/models"
-	p_service "XT_New/service"
-	"XT_New/utils"
+	"XT/models"
+	p_service "XT/service"
+	"XT/utils"
 	"time"
 
 	"github.com/jinzhu/gorm"

service/qcd_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"time"
 )

service/redis.go

@@ -14,7 +14,7 @@ func RedisClient() *redis.Client {
 		Password: beego.AppConfig.String("redispasswrod"), // no password set
 		DB:       0,                                       // use default DB
 	})
-	// pong, err := client.Ping().Result()
-	// fmt.Println(pong, err)
+	pong, err := client.Ping().Result()
+	fmt.Println(pong, err)
 	return client
 }

service/role_service.go

@@ -3,8 +3,8 @@ package service
 import (
 	"time"
 
-	"XT_New/models"
-	"XT_New/utils"
+	"XT/models"
+	"XT/utils"
 
 	"github.com/jinzhu/gorm"
 )

service/schedule_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 
 	"github.com/jinzhu/gorm"
 )

service/sign_weigh_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
 )

service/sms_service.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"XT_New/utils"
+	"XT/utils"
 
 	"github.com/astaxie/beego"
 )

service/statistics_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 )
 
 func GetDayDialysisCount(orgID, date int64) (total int64) {

service/stock_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
 	"strconv"

service/subscibe_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 	"errors"
 	"time"
 )

service/user_service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"XT_New/models"
+	"XT/models"
 
 	"fmt"
 	"github.com/jinzhu/gorm"

service/verify_login_token_service.go

@@ -1,16 +1,18 @@
 package service
 
 import (
-	"XT_New/models"
-	"XT_New/utils"
 	"encoding/json"
-	"fmt"
-	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
 	"time"
+
+	"XT/models"
+	"XT/utils"
+
+	"fmt"
+	"github.com/astaxie/beego"
 )
 
 type AdminUserInfo struct {