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

controllers/base_api_controller.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
+
 	//"XT_New/models"
 	"XT_New/service"
 	"strconv"
@@ -64,36 +66,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 558
-		//userAdmin.Mobile = "13318464649"
-		//
-		////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 = 4
-		//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 = 4
-		//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 = 558
+		userAdmin.Mobile = "13318464649"
+
+		//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 = 4
+		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 = 4
+		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
@@ -306,35 +308,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 558
-		//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 = 4
-		//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 = 4
-		//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 = 558
+		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 = 4
+		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 = 4
+		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/manage_api_controller.go

@@ -1165,35 +1165,35 @@ func (this *MachineApiController) SaveInformation() {
 			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,
+			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,
@@ -1214,38 +1214,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,
@@ -2404,37 +2404,37 @@ func (this *MachineApiController) UpdateForm() {
 	err = service.UpdatedZoneID(bednumber, orgid, &deviceNumber)
 	fmt.Println("更新区号失败", err)
 	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,
@@ -2944,9 +2944,9 @@ func (this *MachineApiController) SaveMode() {
 	if errcode == gorm.ErrRecordNotFound {
 		err = service.SaveMode(&mode)
 	} else if errcode == nil {
-		fmt.Print("设备型号已存在")
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+		return
 	} else {
-		fmt.Print("设备型号已存在")
 	}
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)

controllers/mobile_api_controllers/login_api_controller.go

@@ -7,7 +7,6 @@ import (
 	"XT_New/utils"
 	"encoding/json"
 	"fmt"
-	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -200,15 +199,6 @@ func (this *LoginAPIController) LoginByPwd() {
 			utils.ErrorLog("字段批量插入失败：%v", requestErr)
 		}
 
-		//查询该机构是否存在医护排班
-		_, errcode := service.GetDoctorScheduleByOrgId(org.Id)
-		//如果没有就插入
-		if errcode == gorm.ErrRecordNotFound {
-			err = service.BatchInsertDoctorSchedule(org.Id)
-		} else {
-			utils.ErrorLog("医护排班默认数据插入失败：%v", err)
-		}
-
 		this.ServeSuccessJSON(map[string]interface{}{
 			"admin": adminUser,
 			"user":  appRole,

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2072,9 +2072,14 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		internal_fistula_skin := dataBody["internal_fistula_skin"].(string)
 		evaluation.InternalFistulaSkin = internal_fistula_skin
 	}
+	if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "string" {
+		ishemorrhage, _ := dataBody["is_hemorrhage"].(string)
+		is_hemorrhage, _ := strconv.ParseInt(ishemorrhage, 10, 64)
+		evaluation.IsHemorrhage = is_hemorrhage
 
-	if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
-		is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
+		//if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
+		//	is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
+		//	fmt.Println("is_hemorrhage2222222222222222",is_hemorrhage)
 		if is_hemorrhage != 1 && is_hemorrhage != 2 {
 			is_hemorrhage = 0
 		}

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -220,7 +220,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid":                 vid,
+			"vid": vid,
 		})
 	} else {
 		itemId, err := service.GetIdByItemId(detail.InspectionMinor, orgId)
@@ -230,7 +230,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid":                 itemId.ID,
+			"vid": itemId.ID,
 		})
 	}
 
@@ -544,11 +544,10 @@ func (this *CommonApiController) GetTotalLapseCount() {
 	startime := this.GetString("startime")
 	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
 	startnunix := startTimes.Unix()
-	fmt.Println("开始时间---------------", startnunix)
 	endtime := this.GetString("endtime")
 	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
 	endunix := endtimes.Unix()
-	fmt.Println("endunix==========", endunix)
+
 	//统计该机构的转出人数
 	patients, err := service.GetTotalRollOutPatients(orgid, startnunix, endunix)
 	//统计该机构转出病人
@@ -558,10 +557,14 @@ func (this *CommonApiController) GetTotalLapseCount() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
+
+	//统计当前机构转出的人数
+	rollout, err := service.GetCountRollout(orgid, startnunix, endunix)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"patients":   patients,
 		"count":      count,
 		"patienttwo": patienttwo,
+		"rollout":    rollout,
 	})
 }
 
@@ -2059,3 +2062,59 @@ func (this *CommonApiController) GetIdsListTwo() {
 	})
 
 }
+
+func (this *CommonApiController) GetTreatModeList() {
+
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	list, err := service.GetTreatModeList(start_time, end_time, orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *CommonApiController) GetCountModeId() {
+
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	mode_id, _ := this.GetInt64("mode_id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	fmt.Println("start_time", start_time)
+	fmt.Println("end_time", end_time)
+	fmt.Println("mode_id", mode_id)
+
+	modeCount, err := service.GetCountModeId(start_time, end_time, mode_id, orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"modeCount": modeCount,
+	})
+}
+
+func (this *CommonApiController) GetRolloutCount() {
+
+	start_time, _ := this.GetInt64("start_time")
+	end_time, _ := this.GetInt64("end_time")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+
+	//统计当前机构转出的人数
+	rollout, err := service.GetCountRollout(orgId, start_time, end_time)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rollout": rollout,
+	})
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -56,4 +56,7 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getbloodpressurelist", &CommonApiController{}, "Get:GetBloodPressureList")
 	beego.Router("/com/api/getmonthbloodlist", &CommonApiController{}, "Get:GetMonthBloodList")
 	beego.Router("/com/api/getidslist", &CommonApiController{}, "Post:GetIdsListTwo")
+	beego.Router("/com/api/getreatmodelist", &CommonApiController{}, "Get:GetTreatModeList")
+	beego.Router("/com/api/getcountmodeid", &CommonApiController{}, "Get:GetCountModeId")
+	beego.Router("/com/api/getrolloutcount", &CommonApiController{}, "Get:GetRolloutCount")
 }

controllers/new_mobile_api_controllers/dialysis_parameter_api_controller.go

@@ -45,7 +45,7 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
 	if len(keywords) > 0 {
 
-		dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(orgid, keywords, scheduleType, partitionType, page, limit, theTime.Unix())
+		//dialysisSchedule, err, total := service.GetDialysisParametersByKeyword(orgid, keywords, scheduleType, partitionType, page, limit, theTime.Unix())
 		//查询今日排班的病人
 		patient, err := service.GetDialysisTodaySchedulePatient(orgid, theTime.Unix(), page, limit, keywords)
 		var vlist []interface{}
@@ -57,8 +57,8 @@ func (this *DialysisParamerterApiController) GetMobileDialysisParameters() {
 			elist = append(elist, dialysis)
 			if err == nil {
 				this.ServeSuccessJSON(map[string]interface{}{
-					"schedule":     dialysisSchedule,
-					"total":        total,
+					//"schedule":     dialysisSchedule,
+					//"total":        total,
 					"prescription": vlist,
 					"dialysbefor":  elist,
 					"patient":      patient,

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -2059,3 +2059,78 @@ func (this *NewCommonApiController) GetSystolicBloodNoStand() {
 		"recoredtwo":    recoredtwo,
 	})
 }
+
+func (this *NewCommonApiController) GetMobileTreatModeList() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime := this.GetString("start_time")
+	endtime := this.GetString("end_time")
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startimes := startTimes.Unix()
+
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
+	endtimeData := endtimes.Unix()
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	orgid := adminUserInfo.Org.Id
+	list, err := service.GetTreatModeList(startimes, endtimeData, orgid)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileCountModeId() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime := this.GetString("start_time")
+	endtime := this.GetString("end_time")
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startimes := startTimes.Unix()
+
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
+	endtimeData := endtimes.Unix()
+	mode_id, _ := this.GetInt64("mode_id")
+
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	orgId := adminUserInfo.Org.Id
+
+	modeCount, err := service.GetCountModeId(startimes, endtimeData, mode_id, orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"modeCount": modeCount,
+	})
+}
+
+func (this *NewCommonApiController) GetMobileRolloutCount() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime := this.GetString("start_time")
+	endtime := this.GetString("end_time")
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startimes := startTimes.Unix()
+
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
+	endtimeData := endtimes.Unix()
+
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	orgId := adminUserInfo.Org.Id
+	//统计当前机构转出的人数
+	rollout, err := service.GetCountRollout(orgId, startimes, endtimeData)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rollout": rollout,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -42,4 +42,7 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/getsystolicbloodstand", &NewCommonApiController{}, "Get:GetSystolicBloodStand")
 	beego.Router("/m/api/getmobileidslist", &NewCommonApiController{}, "post:GetMobileIdsList")
 	beego.Router("/m/api/getsystolicbloodnostand", &NewCommonApiController{}, "Get:GetSystolicBloodNoStand")
+	beego.Router("/m/api/getmobiletreatmodelist", &NewCommonApiController{}, "Get:GetMobileTreatModeList")
+	beego.Router("/m/api/getmobileCountModeId", &NewCommonApiController{}, "Get:GetMobileCountModeId")
+	beego.Router("/m/api/getmobilerolloutcount", &NewCommonApiController{}, "Get:GetMobileRolloutCount")
 }

controllers/verify_login_controller.go

@@ -218,6 +218,8 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			if len(curAppUrlfors) == 0 {
 				if adminUser.Id == curOrg.Creator { //超级管理员
 					urlfors, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(3)
+					urlforss, _, _ := service.GetSuperAdminUsersPurviewTreeAndUrlfors(8)
+					urlfors = append(urlfors, urlforss...)
 					didRegistedForSCRM = true
 					didRegistedForCDM = true
 					didRegistedForMall = true

models/common_models.go

@@ -580,3 +580,16 @@ type BloodDialysisModeIdCount struct {
 	ModeId    int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
 	Count     int64
 }
+
+type BloodTreateModeIdCount struct {
+	ModeId       int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Count        int64
+	DialysisDate int64 `gorm:"column:dialysis_date" json:"dialysis_date" form:"dialysis_date"`
+}
+
+type BloodLapsetoCount struct {
+	ID          int64 `gorm:"column:id" json:"id" form:"id"`
+	Count       int64
+	LapsetoTime int64 `gorm:"column:lapseto_time" json:"lapseto_time" form:"lapseto_time"`
+	LapsetoType int64 `gorm:"column:lapseto_type" json:"lapseto_type" form:"lapseto_type"`
+}

models/dialysis_parameter_models.go

@@ -112,3 +112,39 @@ func (XtScheduleTwo) TableName() string {
 
 	return "xt_schedule"
 }
+
+type DialysisPrescriptionParameter struct {
+	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji        float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantWeichi        float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang     float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
+	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+}
+
+func (DialysisPrescriptionParameter) TableName() string {
+
+	return "xt_dialysis_prescription"
+}
+
+type PredialysisEvaluationParameter struct {
+	ID                          int64   `gorm:"column:id" json:"id"`
+	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id"`
+	PatientId                   int64   `gorm:"column:patient_id" json:"patient_id"`
+	DryWeight                   float64 `gorm:"column:dry_weight" json:"dry_weight"`
+	WeightAfterLastTransparency float64 `gorm:"column:weight_after_last_transparency" json:"weight_after_last_transparency"`
+	WeighingBefore              float64 `gorm:"column:weighing_before" json:"weighing_before"`
+	AdditionalWeight            float64 `gorm:"column:additional_weight" json:"additional_weight"`
+	WeightBefore                float64 `gorm:"column:weight_before" json:"weight_before"`
+	SymptomBeforeDialysis       string  `gorm:"column:symptom_before_dialysis" json:"symptom_before_dialysis"`
+	SystolicBloodPressure       float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+}
+
+func (PredialysisEvaluationParameter) TableName() string {
+	return "xt_assessment_before_dislysis"
+}

models/patient_models.go

@@ -348,6 +348,7 @@ type PatientDialysisRecord struct {
 	AssessmentAfterDislysis AssessmentAfterDislysis `json:"assessment_after_dislysis" gorm:"foreignkey:AssessmentDate;AssociationForeignKey:DialysisDate;"`
 	TreatmentSummary        TreatmentSummary        `json:"treatment_summary" gorm:"foreignkey:AssessmentDate;AssociationForeignKey:DialysisDate;"`
 	Device                  DeviceNumber            `json:"device" gorm:"foreignkey:ID;AssociationForeignKey:BedID;"`
+	MonitoringRecord        []MonitoringRecord      `json:"monitoring_record" gorm:"foreignkey:MonitoringDate;AssociationForeignKey:DialysisDate;"`
 }
 
 type DialysisPrescriptionAddtional struct {

service/common_service.go

@@ -3336,3 +3336,56 @@ func GetModeIdCount(startime int64, endtime int64, orgid int64, page int64, limi
 	err = db.Group(" s.patient_id,s.mode_id").Select("s.mode_id,	s.patient_id,	count(o.id) as count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1 ").Scan(&order).Error
 	return order, err
 }
+
+func GetTreatModeList(startime int64, endtime int64, orgid int64) (order []*models.BloodDialysisModeIdCount, err error) {
+
+	table := XTReadDB().Table("xt_schedule as s")
+	fmt.Println("table", table)
+	db := XTReadDB().Table("xt_dialysis_order as o")
+	if orgid > 0 {
+		db = db.Where("o.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("o.dialysis_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("o.dialysis_date<=?", endtime)
+	}
+	err = db.Group("s.mode_id").Select("s.mode_id,	s.patient_id").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1 ").Scan(&order).Error
+	return order, err
+
+}
+
+func GetCountModeId(startime int64, endtime int64, modeid int64, orgid int64) (order []*models.BloodTreateModeIdCount, err error) {
+
+	table := XTReadDB().Table("xt_schedule as s")
+	fmt.Println("table", table)
+	db := XTReadDB().Table("xt_dialysis_order as o")
+	if orgid > 0 {
+		db = db.Where("o.user_org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("o.dialysis_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("o.dialysis_date<=?", endtime)
+	}
+	err = db.Group("o.dialysis_date,s.mode_id").Select("s.mode_id,	count(s.mode_id) as count,o.dialysis_date").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1 and s.mode_id = ? and o.dialysis_date <> ''", modeid).Scan(&order).Error
+	return order, err
+
+}
+
+func GetCountRollout(orgid int64, startime int64, endtime int64) (lapseto []*models.BloodLapsetoCount, err error) {
+
+	table := XTReadDB().Table("xt_patients as s")
+	fmt.Println(table)
+	db := XTReadDB().Table("xt_patient_lapseto as x").Where("x.status = 1")
+	if startime > 0 {
+		db = db.Where("x.lapseto_time >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.lapseto_time<=?", endtime)
+	}
+	err = db.Group("x.lapseto_time,x.lapseto_type").Select("count(x.id) as count,x.lapseto_type,x.lapseto_time").Joins("left join xt_patients as s  on s.id = x.patient_id").Where("s.user_org_id = ?", orgid).Scan(&lapseto).Error
+	return lapseto, err
+}

service/dialysis_parameter_service.go

@@ -325,15 +325,15 @@ func GetLastAssessmentBeforDialysis(patientid int64, orgid int64) (models.Predia
 	return evaluation, err
 }
 
-func GetDialysisPrescriptionList(patientid int64, orgid int64, startime int64) (models.XtDialysisPrescription, error) {
-	prescription := models.XtDialysisPrescription{}
+func GetDialysisPrescriptionList(patientid int64, orgid int64, startime int64) (models.DialysisPrescriptionParameter, error) {
+	prescription := models.DialysisPrescriptionParameter{}
 	err := XTReadDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientid, orgid, startime).Find(&prescription).Error
 	return prescription, err
 }
 
-func GetTodayAssessmentBeforDialysis(patientid int64, orgid int64, startime int64) (*models.PredialysisEvaluation, error) {
+func GetTodayAssessmentBeforDialysis(patientid int64, orgid int64, startime int64) (*models.PredialysisEvaluationParameter, error) {
 
-	evaluation := models.PredialysisEvaluation{}
+	evaluation := models.PredialysisEvaluationParameter{}
 	err := XTReadDB().Model(&evaluation).Where("patient_id = ? and user_org_id = ? and assessment_date = ? and status = 1", patientid, orgid, startime).Find(&evaluation).Error
 	if err == gorm.ErrRecordNotFound {
 		return nil, err

service/patientmanage_service.go

@@ -841,6 +841,7 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 	var orders []*models.PatientDialysisRecord
 
 	db := readDb.Table("xt_dialysis_order as do").
+		Preload("MonitoringRecord", "patient_id = ? and user_org_id = ? and status = 1", patientID, orgID).
 		Preload("DialysisPrescription", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("PredialysisEvaluation", "patient_id=? and user_org_id=? and status=1", patientID, orgID).
 		Preload("DialysisPrescription", func(db *gorm.DB) *gorm.DB {