提交

controllers/base_api_controller.go

@@ -81,7 +81,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		//userAdmin.ModifyTime = 1530786071
 		//var subscibe models.ServeSubscibe
 		//subscibe.ID = 1
-		//subscibe.OrgId = 7957
+		//subscibe.OrgId = 3877
 		//subscibe.PeriodStart = 1538035409
 		//subscibe.PeriodEnd = 1569571409
 		//subscibe.State = 1
@@ -91,7 +91,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		//subscibes[4] = &subscibe
 		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 7957
+		//adminUserInfo.CurrentOrgId = 3877
 		//adminUserInfo.CurrentAppId = 18
 		//adminUserInfo.AdminUser = &userAdmin
 		//adminUserInfo.Subscibes = subscibes

controllers/mobile_api_controllers/admin_user_api_controller.go

@@ -73,7 +73,6 @@ func (c *AdminUserApiController) SaveAdminUserElectronicSignature() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	}
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"electronic_signature": es,
 	})

controllers/mobile_api_controllers/login_api_controller.go

@@ -32,8 +32,8 @@ func (this *LoginAPIController) LoginByPwd() {
 	}
 	ip := utils.GetIP(this.Ctx.Request)
 
-	//ssoDomain := beego.AppConfig.String("sso_domain")
-	ssoDomain := "http://localhost:8091"
+	ssoDomain := beego.AppConfig.String("sso_domain")
+	//ssoDomain := "http://localhost:8091"
 	api := ssoDomain + "/m/login/pwd"
 	values := make(url.Values)
 	values.Set("mobile", mobile)

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2674,7 +2674,6 @@ func (this *NewDialysisApiController) UpdateImage() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
 		return
 	}
-	fmt.Println("esss-================", es)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"electronic_signature": es,
 	})

models/common_models.go

@@ -16,6 +16,7 @@ type QualityControlStandard struct {
 	Unit            string `gorm:"column:unit" json:"unit" form:"unit"`
 	ProjectName     string `gorm:"column:project_name" json:"project_name" form:"project_name"`
 	ItemName        string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	IsStatus        int64  `gorm:"column:is_status" json:"is_status" form:"is_status"`
 }
 
 type XtQualityControlStandard struct {
@@ -31,6 +32,7 @@ type XtQualityControlStandard struct {
 	LargeRange      string `gorm:"column:large_range" json:"large_range" form:"large_range"`
 	RangeType       int64  `gorm:"column:range_type" json:"range_type" form:"range_type"`
 	RangeValue      string `gorm:"column:range_value" json:"range_value" form:"range_value"`
+	IsStatus        int64  `gorm:"column:is_status" json:"is_status" form:"is_status"`
 }
 
 func (XtQualityControlStandard) TableName() string {

service/common_service.go

@@ -60,25 +60,30 @@ func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*mod
 
 	db := XTReadDB().Table("xt_quality_control_standard as x").Where("x.status =1")
 	if orgid > 0 {
-		db = db.Where("x.user_org_id = ?", orgid)
+		db = db.Where("x.user_org_id = ? and x.is_status = 1", orgid)
 	}
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
 	offset := (page - 1) * limit
-	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name").Count(&total).
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name,x.is_status").Count(&total).
 		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Offset(offset).Limit(limit).Scan(&standard).Error
 	return standard, total, err
 }
 
+func GetDefaultBloodPressure(orgid int64) (standard []models.XtQualityControlStandard, err error) {
+	err = XTReadDB().Model(&standard).Where("user_org_id = ? and status = 1 and is_status = 0", orgid).Find(&standard).Error
+	return standard, err
+}
+
 func GetConfigurationListTwo(orgid int64, limit int64, page int64) (standard []*models.QualityControlStandard, total int64, err error) {
 	db := XTReadDB().Table("xt_quality_control_standard as x").Where("x.status =1")
 	if orgid > 0 {
-		db = db.Where("x.user_org_id = ?", orgid)
+		db = db.Where("x.user_org_id = ? and x.is_status =1", orgid)
 	}
 	table := XTReadDB().Table("xt_inspection_reference as s")
 	fmt.Println(table)
 	offset := (page - 1) * limit
-	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name").Count(&total).
+	err = db.Order("x.sort asc,x.created_time desc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,x.range_value,x.range_type,s.unit,s.project_name,s.item_name,x.is_status").Count(&total).
 		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Offset(offset).Limit(limit).Scan(&standard).Error
 	return standard, total, err
 }
@@ -2704,3 +2709,16 @@ func GetLastPatientsControlTwo(orgid int64, patientid int64, startime int64, end
 
 	return inspection, err
 }
+
+func GetBloodPressureDetail(id int64) (models.XtQualityControlStandard, error) {
+	standard := models.XtQualityControlStandard{}
+	err := XTReadDB().Model(&standard).Where("id=? and status = 1", id).Find(&standard).Error
+	return standard, err
+}
+
+func UpdateBloodPressure(st *models.XtQualityControlStandard, id int64) error {
+
+	err := XTWriteDB().Model(&st).Where("id=?", id).Update(map[string]interface{}{"inspection_major": st.InspectionMajor, "inspection_minor": st.InspectionMinor, "min_range": st.MinRange, "large_range": st.LargeRange, "sort": st.Sort, "updated_time": st.UpdatedTime}).Error
+	return err
+
+}

service/data.go

@@ -190,7 +190,7 @@ func BatchInsertFiledConfig(org_id int64) (err error) {
 
 func BatchInsertQualityControl(org_id int64) (err error) {
 
-	err = readDb.Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value FROM xt_quality_control_standard where user_org_id = 0", org_id).Error
+	err = readDb.Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value,is_status FROM xt_quality_control_standard where user_org_id = 0", org_id).Error
 	return
 }