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

conf/app.conf

@@ -150,26 +150,26 @@ readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = test_xt
+readmysqlname = sgj_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = test_xt
+writemysqlname = sgj_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = test_users
+readusername = sgj_users
 
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = test_users
+writeusername = sgj_users
 
 
 

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1092,29 +1092,27 @@ func (this *CommonApiController) GetFirstQuarter() {
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
 
 	//获取收缩压数据
-	_, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
+	systolic, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
 	//统计收缩压合格的数据
-	systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
+	//systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
 
 	//获取舒张压数据
-	_, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
+	diastolic, diastotal, parseDateErr := service.GetDiastolicBloodPressure(orgid, statime, entime)
 	//获取合格舒张压数据
-	diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
+	//diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
 	normData, _ := service.GetNormData(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"count":          count,
-		"countwo":        countwo,
-		"systolic":       systolic,
-		"systolicTotal":  systolicTotal,
-		"sysstandTotal":  sysstandTotal,
-		"diastolic":      diastolic,
-		"diastotal":      diastotal,
-		"diasstandtotal": diasstandtotal,
-		"normData":       normData,
+		"count":         count,
+		"countwo":       countwo,
+		"systolic":      systolic,
+		"systolicTotal": systolicTotal,
+		"diastolic":     diastolic,
+		"diastotal":     diastotal,
+		"normData":      normData,
 	})
 }
 
@@ -1676,48 +1674,48 @@ func (this *CommonApiController) GetBloodPressureList() {
 	fmt.Println("第四季度", fourQuarterEndStrUnix)
 	if bloodType == -1 {
 		//统计收缩压第一季度的总数
-		_, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		firstList, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
 		//统计收缩压第一季合格的总数
-		_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
 		//统计第二季收缩压总数
-		_, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		secondelist, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
 		//第二季度合格总数
-		_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
 		//统计第三季收缩压总数
-		_, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		threelist, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
 		//第三季度合格数
-		_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
 		//第四季度总数
-		_, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		fourlist, fourTotal, err := service.GetSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		//第四季度合格总数
-		_, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//_, fourStandTotal, err := service.GetStandSystolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"firstTotal":        firstTotal,
-			"firstStandTotal":   firstStandTotal,
-			"secondeTotal":      secondeTotal,
-			"secondeStandTotal": secondeStandTotal,
-			"threeTotal":        threeTotal,
-			"threeStandTotal":   threeStandTotal,
-			"fourTotal":         fourTotal,
-			"fourStandTotal":    fourStandTotal,
+			"firstTotal":   firstTotal,
+			"firstList":    firstList,
+			"secondelist":  secondelist,
+			"secondeTotal": secondeTotal,
+			"threelist":    threelist,
+			"threeTotal":   threeTotal,
+			"fourTotal":    fourTotal,
+			"fourlist":     fourlist,
 		})
 	}
 
 	if bloodType == -2 {
 		//统计舒张压第一季度的总数
-		_, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
-		_, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
-		_, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
-		_, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
-		_, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
-		_, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
-		_, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
-		_, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		firstList, firstTotal, err := service.GetDiastolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//_, firstStandTotal, err := service.GetDiastolicStandPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		secondelist, secondeTotal, err := service.GetDiastolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//_, secondeStandTotal, err := service.GetDiastolicStandPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		threelist, threeTotal, err := service.GetDiastolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//_, threeStandTotal, err := service.GetDiastolicStandPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		fourlist, fourTotal, err := service.GetDiastolicBloodPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//_, fourStandTotal, err := service.GetDiastolicStandPressure(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
 
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -1725,14 +1723,14 @@ func (this *CommonApiController) GetBloodPressureList() {
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"firstTotal":        firstTotal,
-			"firstStandTotal":   firstStandTotal,
-			"secondeTotal":      secondeTotal,
-			"secondeStandTotal": secondeStandTotal,
-			"threeTotal":        threeTotal,
-			"threeStandTotal":   threeStandTotal,
-			"fourTotal":         fourTotal,
-			"fourStandTotal":    fourStandTotal,
+			"firstTotal":   firstTotal,
+			"firstList":    firstList,
+			"secondelist":  secondelist,
+			"secondeTotal": secondeTotal,
+			"threelist":    threelist,
+			"threeTotal":   threeTotal,
+			"fourTotal":    fourTotal,
+			"fourlist":     fourlist,
 		})
 	}
 }

models/patient_models.go

@@ -744,6 +744,19 @@ func (XtInspection) TableName() string {
 	return "xt_inspection"
 }
 
+type BloodXtPatients 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"`
+	DialysisNo string `gorm:"column:dialysis_no" json:"dialysis_no" form:"dialysis_no"`
+	Name       string `gorm:"column:name" json:"name" form:"name"`
+	IdCardNo   string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+}
+
+func (BloodXtPatients) TableName() string {
+
+	return "xt_patients"
+}
+
 type XtPatients 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"`

service/common_service.go

@@ -334,7 +334,7 @@ func GetDialysisAgeData(orgID int64) (counts []*models.DialysisAgePieDataStruct,
 
 }
 
-func GetCurentOrgPatients(orgid int64) (patients []*models.XtPatients, err error) {
+func GetCurentOrgPatients(orgid int64) (patients []*models.BloodXtPatients, err error) {
 
 	err = XTReadDB().Where("user_org_id = ? and status =1", orgid).Order("created_time desc").Find(&patients).Error
 	return patients, err
@@ -2723,10 +2723,10 @@ func UpdateBloodPressure(st *models.XtQualityControlStandard, id int64) error {
 
 }
 
-func GetSystolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
+func GetSystolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.VmMonitoringRecord, total int64, err error) {
 
 	db := XTReadDB().Table("xt_monitoring_record as x")
-	err = db.Select("x.id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	err = db.Select("x.id,x.systolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.systolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	return record, total, err
 }
 
@@ -2737,10 +2737,10 @@ func GetStandSystolicBloodPressure(orgid int64, startime int64, endtime int64) (
 	return record, total, err
 }
 
-func GetDiastolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
+func GetDiastolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.VmMonitoringRecord, total int64, err error) {
 
 	db := XTReadDB().Table("xt_monitoring_record as x")
-	err = db.Select("x.id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.diastolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	err = db.Select("x.id,x.diastolic_blood_pressure").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and x.diastolic_blood_pressure <> 0", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
 	return record, total, err
 }
 

service/data.go

@@ -12,7 +12,7 @@ import (
 func GetConfigList(orgID int64) (dataconfig interface{}, err error) {
 	var configList []*models.Dataconfig
 
-	err = readDb.Model(&models.Dataconfig{}).Where("(org_id in (0,?) and status = 1) or (status = 0 and delete_id_system > 0 and org_id = ?)", orgID, orgID).Order("orders desc, id asc").Find(&configList).Error
+	err = readDb.Model(&models.Dataconfig{}).Where("(org_id in (0,?) and status = 1) or (status = 0 and delete_id_system > 0 and org_id = ?)", orgID, orgID).Order("orders asc, id asc").Find(&configList).Error
 	if err != nil {
 		return nil, err
 	}