更新

controllers/gobal_config_api_controller.go

@@ -1032,6 +1032,7 @@ func (this *GobalConfigApiController) ChangeOrg() {
 			QualityeList, err := service.FindQualityByOrgId(tempOrg.Id)
 			if len(QualityeList) == 0 {
 				err = service.BatchInsertQualityControl(tempOrg.Id)
+				err = service.BathInsertQualityControlTwo(tempOrg.Id)
 			} else {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}

controllers/mobile_api_controllers/login_api_controller.go

@@ -176,6 +176,7 @@ func (this *LoginAPIController) LoginByPwd() {
 			QualityeList, err := service.FindQualityByOrgId(org.Id)
 			if len(QualityeList) == 0 {
 				err = service.BatchInsertQualityControl(org.Id)
+				err = service.BathInsertQualityControlTwo(org.Id)
 			} else {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -185,6 +185,7 @@ func (this *ForgetPwdController) ModifyPassword() {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
+						err = service.BathInsertQualityControlTwo(org.Id)
 					} else {
 						utils.ErrorLog("字段批量插入失败：%v", err)
 					}

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -238,6 +238,7 @@ func (this *HomeController) ChangeOrg() {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
+						err = service.BathInsertQualityControlTwo(org.Id)
 					} else {
 						utils.ErrorLog("字段批量插入失败：%v", err)
 					}

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -1923,3 +1923,36 @@ func (this *NewCommonApiController) GetTargetStandDetail() {
 		"inspectlist":   inspectlist,
 	})
 }
+
+func (this *NewCommonApiController) GetSystolicBloodStand() {
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgId := adminUser.Org.Id
+	fmt.Println("orgID", orgId)
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	startime := this.GetString("startime")
+	endtime := this.GetString("endtime")
+	limit, _ := this.GetInt64("limit")
+	fmt.Println("limit", limit)
+	page, _ := this.GetInt64("page")
+	fmt.Println("page", page)
+	startTimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", startime+" 00:00:00", loc)
+	startimeUnix := startTimes.Unix()
+	fmt.Println(startimeUnix)
+	endtimes, _ := time.ParseInLocation(timeLayout+" 15:04:05", endtime+" 23:59:59", loc)
+	endtimeUnix := endtimes.Unix()
+	fmt.Println(endtimeUnix)
+
+	//获取数据
+	recordList, err := service.GetDiastolicStand(orgId, startimeUnix, endtimeUnix)
+	bloodPressure, err := service.GetDefaultBloodPressure(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"recordList":    recordList,
+		"bloodPressure": bloodPressure,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -39,4 +39,5 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/getmonthbloolist", &NewCommonApiController{}, "Get:GetMonthBLoodList")
 	beego.Router("/m/api/gettargetnostanddetail", &NewCommonApiController{}, "Get:GetTargetNoStandDetail")
 	beego.Router("/m/api/gettargestanddetail", &NewCommonApiController{}, "Get:GetTargetStandDetail")
+	beego.Router("/m/api/getsystolicbloodstand", &NewCommonApiController{}, "Get:GetSystolicBloodStand")
 }

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -301,6 +301,7 @@ func (this *NewLoginApiController) LoginByCs() {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
+						err = service.BathInsertQualityControlTwo(org.Id)
 					} else {
 						utils.ErrorLog("字段批量插入失败0：%v", err)
 					}

controllers/verify_login_controller.go

@@ -163,6 +163,7 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 				QualityeList, err := service.FindQualityByOrgId(curOrg.Id)
 				if len(QualityeList) == 0 {
 					err = service.BatchInsertQualityControl(curOrg.Id)
+					err = service.BathInsertQualityControlTwo(curOrg.Id)
 				} else {
 					utils.ErrorLog("字段批量插入失败：%v", err)
 				}

models/common_models.go

@@ -480,6 +480,16 @@ type TreatTotalStruct struct {
 	ModeID string `json:"mode_id"`
 }
 
+type XTMonitoringRecords 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"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	Monitoring_date        int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	Name                   string  `gorm:"column:name" json:"name"`
+}
+
 type XTMonitoringRecord struct {
 	ID                        int64   `gorm:"column:id" json:"id"`
 	UserOrgId                 int64   `gorm:"column:user_org_id" json:"user_org_id"`

service/common_service.go

@@ -70,7 +70,7 @@ func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*mod
 	return standard, total, err
 }
 
-func GetDefaultBloodPressure(orgid int64) (standard []models.XtQualityControlStandard, err error) {
+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
 }
@@ -3213,3 +3213,10 @@ func GetStandList(orgid int64, startime int64, endtime int64, limit int64, page
 
 	return inspection, err
 }
+
+func GetDiastolicStand(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x")
+	err = db.Select("x.id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and (x.systolic_blood_pressure <> 0 or x.diastolic_blood_pressure)", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Scan(&record).Error
+	return record, err
+}

service/data.go

@@ -190,7 +190,12 @@ 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,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
+	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 and is_status = 1", org_id).Error
+	return
+}
+
+func BathInsertQualityControlTwo(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,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 and is_status = 0", org_id).Error
 	return
 }