更新代码

conf/app.conf

 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 

controllers/dialysis_api_controller.go

 	//获取医嘱内容
 	doctor, err := service.FindDoctor(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
 	DoctorName, err := service.FindDoctorName(doctorAdvice.AdviceDoctor, adminUserInfo.CurrentAppId, adminUserInfo.CurrentOrgId)
-	fmt.Print("err-----------------------------------------------------------------", err)
+	//fmt.Print("err-----------------------------------------------------------------", err)
 	DoctorAdvice, _ := service.FindDoctorAdviceOrderById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	doctorAdevieInfo, err := service.FindDoctorAdviceByInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 	//获取上次的透后体重
 	check, _ := service.FindDoubleCheckById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
 
 	//相关操作对应的操作人
-	operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
-
+	//operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
+	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"xtdate":                  xtdate,

controllers/mobile_api_controllers/dialysis_api_controller.go

 
 	//dialysisSolution, getDialysisSolutionErr := service.MobileGetDialysisSolution(adminInfo.Org.Id, patientID)
 
-	operators, _ := service.GetAllAdminUserES(adminInfo.Org.Id, adminInfo.App.Id)
+	//operators, _ := service.GetAllAdminUserES(adminInfo.Org.Id, adminInfo.App.Id)
 
 	if getLPEErr != nil {
 		this.ErrorLog("获取上一次透前评估失败:%v", getLPEErr)
 	goodTypes, _ := service.FindAllGoodTypeByType(1)          //查出所有库存配置的系统类型
 	goodInfos, _ := service.FindAllGoodInfo(adminInfo.Org.Id) //查出所有库存配置的系统类型
 
+	operators, err := service.GetAllStarfEs(adminInfo.Org.Id)
+	fmt.Println("报错-------", err)
+	fmt.Println("op----------------------------------------------------------", operators)
+
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
 	})
 
 }
+
+func (c *DialysisAPIController) GetPatientId() {
+	id, _ := c.GetInt64("id")
+	patientId, _ := service.GetPatientId(id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"patient": patientId,
+	})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

 
 	beego.Router("/m/api/schedule/get", &DialysisAPIController{}, "Get:GetSchedule")
 
+	beego.Router("/m/api/getPatientid", &DialysisAPIController{}, "Get:GetPatientId")
+
 }

controllers/mobile_api_controllers/patient_api_controller.go

 }
 
 func (c *PatientApiController) GetPrintDialysisOrder() {
-	fmt.Println("触发-------------------------")
 	xtno := c.GetString("xtno")
 	xtdate := c.GetString("xtdate")
 
 	receiverTreatmentAccess, _ := service.FindReceiverTreatmentAccessRecordById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 
 	//相关操作对应的操作人
-	operators, _ := service.GetAdminUserES(adminUserInfo.Org.Id, adminUserInfo.App.Id, operatorIDs)
+	//operators, _ := service.GetAdminUserES(adminUserInfo.Org.Id, adminUserInfo.App.Id, operatorIDs)
+	operators, err := service.GetAllStarfEs(adminUserInfo.Org.Id)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
 	c.ServeSuccessJSON(map[string]interface{}{

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

 }
 
 func (this *NewDialysisApiController) GetPatientDetail() {
+	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)
+	nowdate := theTime.Unix()
 	id, _ := this.GetInt64("id")
 	//获取病人详情信息
 	detail, err := service.GetPatientDetailTwo(id)
 		"diseases":       diseases,
 		"slowDiseases":   slowDiseases,
 		"cronicDiseases": cronicDiseases,
+		"nowdate":        nowdate,
 	})
 }
 
 	fmt.Println("分区型号", zonetype)
 	strInt64 := strconv.FormatInt(zonetype, 10)
 	typeid, _ := strconv.Atoi(strInt64)
-	zone := models.DeviceZone{
-		Name:       name,
-		Type:       typeid,
-		OrgID:      adminInfo.Org.Id,
-		Status:     1,
-		CreateTime: time.Now().Unix(),
-	}
-	err := service.CreatedZone(&zone)
-	if err != nil {
+	_, errcode := service.GetPartitionByName(name, adminInfo.Org.Id)
+	fmt.Println("errcode-------", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		zone := models.DeviceZone{
+			Name:       name,
+			Type:       typeid,
+			OrgID:      adminInfo.Org.Id,
+			Status:     1,
+			CreateTime: time.Now().Unix(),
+		}
+		err := service.CreatedZone(&zone)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"zone": zone,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"zone": zone,
-	})
 }
 
 func (this *NewDialysisApiController) GetAllZone() {
 	orgid := adminUser.Org.Id
 	name := this.GetString("name")
 	fmt.Println("name", name)
-	group := models.DeviceGroup{
-		Name:       name,
-		Status:     1,
-		CreateTime: time.Now().Unix(),
-		OrgID:      orgid,
-	}
-	err := service.SaveGroup(&group)
-	if err != nil {
+	_, errcode := service.GetGroupByName(name, orgid)
+	if errcode == gorm.ErrRecordNotFound {
+		group := models.DeviceGroup{
+			Name:       name,
+			Status:     1,
+			CreateTime: time.Now().Unix(),
+			OrgID:      orgid,
+		}
+		err := service.SaveGroup(&group)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"group": group,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"group": group,
-	})
+
 }
 
 func (this *NewDialysisApiController) GetAllGroup() {
 	fmt.Print("zone", zone)
 	group, _ := this.GetInt64("group")
 	fmt.Println("group", group)
-	number := models.DeviceNumber{
-		Number:     name,
-		ZoneID:     zone,
-		GroupID:    group,
-		OrgID:      orgid,
-		Status:     1,
-		CreateTime: time.Now().Unix(),
-	}
-	err := service.CreateNumber(&number)
-	if err != nil {
+	_, errcode := service.GetBedByName(name, orgid)
+	if errcode == gorm.ErrRecordNotFound {
+		number := models.DeviceNumber{
+			Number:     name,
+			ZoneID:     zone,
+			GroupID:    group,
+			OrgID:      orgid,
+			Status:     1,
+			CreateTime: time.Now().Unix(),
+		}
+		err := service.CreateNumber(&number)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"number": number,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"number": number,
-	})
+
 }
 
 func (this *NewDialysisApiController) GetAllNumber() {
 }
 
 func (this *NewDialysisApiController) UpdatePartition() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
 	zoneType, _ := this.GetInt64("type")
 	strInt64 := strconv.FormatInt(zoneType, 10)
 	typeid, _ := strconv.Atoi(strInt64)
+	byName, _ := service.GetPartitionByNameOne(name, orgid)
+	if byName.ID > 0 && byName.ID != id {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
 	zone := models.DeviceZone{
 		Name: name,
 		Type: typeid,
 }
 
 func (this *NewDialysisApiController) UpdateGroup() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgid := adminUser.Org.Id
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
+	byName, _ := service.GetGroupByNameOne(name, orgid)
+	if byName.ID > 0 && byName.ID != id {
+		return
+	}
 	group := models.DeviceGroup{Name: name}
 	err := service.UpdateGroup(id, &group)
 	if err != nil {
 }
 
 func (this *NewDialysisApiController) UpdatedBed() {
+	adminUser := this.GetMobileAdminUserInfo()
+	orgId := adminUser.Org.Id
 	id, _ := this.GetInt64("id")
 	name := this.GetString("name")
 	fmt.Println("name", name)
 	fmt.Println("zone", zone)
 	group, _ := this.GetInt64("group")
 	fmt.Println("group", group)
+	BedName, _ := service.GetBedByNameOne(name, orgId)
+	fmt.Println("-----", BedName.ID)
+	if BedName.ID > 0 && BedName.ID != id {
+		return
+	}
 	number := models.DeviceNumber{
 		Number:  name,
 		ZoneID:  zone,

models/admin_user_models.go

 	return "sgj_user_admin_electronic_signature"
 }
 
+type SgjUserAdminRoles struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Url           string `gorm:"column:url" json:"url" form:"url"`
+	Hash          string `gorm:"column:hash" json:"hash" form:"hash"`
+}
+
 // 管理员用户特殊权限，详见表注释
 type AdminUserSpecialPermission struct {
 	ID          int64 `gorm:"column:id" json:"id"`

models/dialysis.go

 	return "xt_gobal_template"
 }
 
+type UserAdminRoles struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Url           string `gorm:"column:url" json:"url" form:"url"`
+	Hash          string `gorm:"column:hash" json:"hash" form:"hash"`
+}
+
 type SgjUserAdminRole struct {
 	ID            int64  `gorm:"column:id" json:"id" form:"id"`
 	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`

service/device_service.go

 
 	return mode, err
 }
+
+func GetPatientId(id int64) (models.XtPatientsNew, error) {
+
+	patientsNew := models.XtPatientsNew{}
+	err := XTReadDB().Model(&patientsNew).Where("blood_id = ? and status = 1", id).Find(&patientsNew).Error
+	return patientsNew, err
+}

service/dialysis_service.go

 	return
 }
 
+func GetAdminUserEsOne(orgid int64) (adminrole []*models.UserAdminRoles, err error) {
+
+	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
+	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
+	fmt.Println(table)
+	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&adminrole).Error
+	return adminrole, err
+}
+
 func UpDateDialysisPrescriptionDoctorSign(patient int64, date int64, orgId int64, doctor_id int64) (err error) {
 	err = writeDb.Model(&models.DialysisPrescription{}).Where("user_org_id = ? AND patient_id = ? AND record_date = ? ", orgId, patient, date).Updates(map[string]interface{}{"prescription_doctor": doctor_id}).Error
 	return
 	return
 }
 
+func GetAllStarfEs(orgid int64) (es []*models.SgjUserAdminRoles, err error) {
+
+	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
+	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.admin_user_id,x.org_id,x.app_id,x.role_id,x.user_name,x.avatar,x.user_type,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id and s.status = 1").Where("x.org_id = ?", orgid).Scan(&es).Error
+	return es, err
+}
+
 func FindLastMonitorRecord(patient_id int64, org_id int64) (record models.MonitoringRecord, err error) {
 	err = readDb.Model(&models.MonitoringRecord{}).Where("patient_id = ? AND status = 1 AND user_org_id = ?", patient_id, org_id).Last(&record).Error
 	return

service/patientmanage_service.go

 	return err
 }
 
+func GetPartitionByName(name string, orgid int64) (*models.DeviceZone, error) {
+	zone := models.DeviceZone{}
+	err := XTReadDB().Model(&zone).Where("name = ? and org_id = ? and status = 1", name, orgid).Find(&zone).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &zone, nil
+}
+
+func GetPartitionByNameOne(name string, orgid int64) (zone models.DeviceZone, err error) {
+
+	err = XTReadDB().Model(&zone).Where("name = ? and org_id = ? and status = 1", name, orgid).First(&zone).Error
+	return zone, err
+}
+
 func CreatedZone(zone *models.DeviceZone) error {
 
 	err := XTWriteDB().Model(&zone).Create(&zone).Error
 	return err
 }
 
+func GetGroupByName(name string, orgid int64) (*models.DeviceGroup, error) {
+	group := models.DeviceGroup{}
+	err := XTReadDB().Model(&group).Where("name = ? and org_id = ? and status = 1", name, orgid).Find(&group).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &group, nil
+}
+
+func GetGroupByNameOne(name string, orgid int64) (group models.DeviceGroup, err error) {
+	err = XTReadDB().Model(&group).Where("name = ? and org_id = ? and status =1", name, orgid).First(&group).Error
+	return group, err
+}
+
 func SaveGroup(group *models.DeviceGroup) error {
 	err := XTWriteDB().Model(&group).Create(&group).Error
 	return err
 	return group, err
 }
 
+func GetBedByName(name string, orgid int64) (*models.DeviceNumber, error) {
+	number := models.DeviceNumber{}
+	err := XTReadDB().Model(&number).Where("number=? and org_id = ? and status =1", name, orgid).Find(&number).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &number, nil
+}
+
+func GetBedByNameOne(name string, orgid int64) (number models.DeviceNumber, err error) {
+
+	err = XTReadDB().Model(&number).Where("number=? and org_id = ? and status = 1", name, orgid).First(&number).Error
+	return number, err
+}
+
 func CreateNumber(number *models.DeviceNumber) error {
 
 	err := XTWriteDB().Model(&number).Create(&number).Error