提交

controllers/device_api_controller.go

@@ -1194,7 +1194,7 @@ func (this *DeviceAPIController) GetMachineDetail() {
 	orgid := adminUserInfo.CurrentOrgId
 	fmt.Println("orgid", orgid)
 	addmacher, err := service.GetMachineDetail(id, orgid)
-	fmt.Print("err--------------------------------------------", err)
+	fmt.Print("err", err)
 	warning, err := service.GetTimeWarning(id, orgid)
 	germ, err := service.GetTimeLast(id, orgid)
 	clean, err := service.GetTimeLastData(id, orgid)

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -219,7 +219,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid": vid,
+			"vid":                 vid,
 		})
 	} else {
 		itemId, err := service.GetIdByItemId(detail.InspectionMinor, orgId)
@@ -229,7 +229,7 @@ func (this *CommonApiController) GetConfigurationDetail() {
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid": itemId.ID,
+			"vid":                 itemId.ID,
 		})
 	}
 
@@ -1877,156 +1877,156 @@ func (this *CommonApiController) GetMonthBloodList() {
 	//统计收缩压
 	if bloodtype == -1 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marchlist, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marchlist":    marchlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 
 	//统计舒张压
 	if bloodtype == -2 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marchlist, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marchlist":    marchlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/utils"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"time"
 )
 
@@ -522,29 +523,27 @@ func (this *NewCommonApiController) GetMobileFirstQuarter() {
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
 	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)
-	normData, _ := service.GetNormData(orgid)
+	//diastolic, diasstandtotal, parseDateErr := service.GetDiastolicStandPressure(orgid, statime, entime)
+	normData, _ := service.GetNormDataByOrgId(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,
 	})
 }
 
@@ -1029,47 +1028,47 @@ func (this *NewCommonApiController) GetMoblieBloodList() {
 	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,
+			"secondeTotal": secondeTotal,
+			"secondelist":  secondelist,
+			"threeTotal":   threeTotal,
+			"threelist":    threelist,
+			"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)
@@ -1077,14 +1076,14 @@ func (this *NewCommonApiController) GetMoblieBloodList() {
 		}
 
 		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,
+			"secondeTotal": secondeTotal,
+			"secondelist":  secondelist,
+			"threeTotal":   threeTotal,
+			"threelist":    threelist,
+			"fourTotal":    fourTotal,
+			"fourlist":     fourlist,
 		})
 	}
 }
@@ -1231,156 +1230,156 @@ func (this *NewCommonApiController) GetBloodMonthList() {
 	//统计收缩压
 	if bloodtype == -1 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetStandSystolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetStandSystolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marlist, marchTotal, err := service.GetSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetStandSystolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetStandSystolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetStandSystolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetStandSystolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetStandSystolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetStandSystolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetStandSystolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetStandSystolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetStandSystolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetStandSystolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marlist":      marlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 
 	//统计舒张压
 	if bloodtype == -2 {
 		//统计收缩压一月总数
-		_, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
-		_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		januarylist, januaryTotal, err := service.GetDiastolicBloodPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
+		//_, januaryStandTotal, err := service.GetDiastolicStandPressure(orgId, januaryStartStrUnix, januaryEndStrUnix)
 
 		//二月
-		_, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
-		_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		feblist, febTotal, err := service.GetDiastolicBloodPressure(orgId, febStartStrStrUnix, febEndStrUnix)
+		//_, febStandTotal, err := service.GetDiastolicStandPressure(orgId, febStartStrStrUnix, febEndStrUnix)
 
 		//三月
-		_, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
-		_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		marlist, marchTotal, err := service.GetDiastolicBloodPressure(orgId, marchStartStrUnix, marchEndStrUnix)
+		//_, marchStandTotal, err := service.GetDiastolicStandPressure(orgId, marchStartStrUnix, marchEndStrUnix)
 
 		//四月
-		_, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
-		_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		aprlist, aprTotal, err := service.GetDiastolicBloodPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
+		//_, aprStandTotal, err := service.GetDiastolicStandPressure(orgId, aprStartStrUnix, aprEndStrsUnix)
 
 		//五月
-		_, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
-		_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		maylist, mayTotal, err := service.GetDiastolicBloodPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
+		//_, mayStandTotal, err := service.GetDiastolicStandPressure(orgId, mayStartStrUnix, mayEndStrsUnix)
 
 		//六月
-		_, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
-		_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		junlist, junTotal, err := service.GetDiastolicBloodPressure(orgId, junStartStrUnix, junEndStrsUnix)
+		//_, junStandTotal, err := service.GetDiastolicStandPressure(orgId, junStartStrUnix, junEndStrsUnix)
 		//7月
-		_, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
-		_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		jullist, julTotal, err := service.GetDiastolicBloodPressure(orgId, julStartStrUnix, julEndStrsUnix)
+		//_, julStandTotal, err := service.GetDiastolicStandPressure(orgId, julStartStrUnix, julEndStrsUnix)
 
 		//8月
-		_, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
-		_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		auglist, augTotal, err := service.GetDiastolicBloodPressure(orgId, augStartStrUnix, augEndStrsUnix)
+		//_, augStandTotal, err := service.GetDiastolicStandPressure(orgId, augStartStrUnix, augEndStrsUnix)
 
 		//9月
-		_, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
-		_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		seplist, sepTotal, err := service.GetDiastolicBloodPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
+		//_, sepStandTotal, err := service.GetDiastolicStandPressure(orgId, sepStartStrUnix, sepEndStrsUnix)
 		//10月
-		_, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
-		_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		octlist, octTotal, err := service.GetDiastolicBloodPressure(orgId, octStartStrUnix, octEndStrsUnix)
+		//_, octStandTotal, err := service.GetDiastolicStandPressure(orgId, octStartStrUnix, octEndStrsUnix)
 		//11月
-		_, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
-		_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		novlist, novTotal, err := service.GetDiastolicBloodPressure(orgId, novStartStrUnix, novEndStrsUnix)
+		//_, novStandTotal, err := service.GetDiastolicStandPressure(orgId, novStartStrUnix, novEndStrsUnix)
 		//12月
-		_, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
-		_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		declist, decTotal, err := service.GetDiastolicBloodPressure(orgId, decStartStrUnix, decEndStrsUnix)
+		//_, decStandTotal, err := service.GetDiastolicStandPressure(orgId, decStartStrUnix, decEndStrsUnix)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
 		}
 
 		this.ServeSuccessJSON(map[string]interface{}{
-			"januaryTotal":      januaryTotal,
-			"januaryStandTotal": januaryStandTotal,
-			"febTotal":          febTotal,
-			"febStandTotal":     febStandTotal,
-			"marchTotal":        marchTotal,
-			"marchStandTotal":   marchStandTotal,
-			"aprTotal":          aprTotal,
-			"aprStandTotal":     aprStandTotal,
-			"mayTotal":          mayTotal,
-			"mayStandTotal":     mayStandTotal,
-			"junTotal":          junTotal,
-			"junStandTotal":     junStandTotal,
-			"julTotal":          julTotal,
-			"julStandTotal":     julStandTotal,
-			"augTotal":          augTotal,
-			"augStandTotal":     augStandTotal,
-			"sepTotal":          sepTotal,
-			"sepStandTotal":     sepStandTotal,
-			"octTotal":          octTotal,
-			"octStandTotal":     octStandTotal,
-			"novTotal":          novTotal,
-			"novStandTotal":     novStandTotal,
-			"decTotal":          decTotal,
-			"decStandTotal":     decStandTotal,
+			"januaryTotal": januaryTotal,
+			"januarylist":  januarylist,
+			"febTotal":     febTotal,
+			"feblist":      feblist,
+			"marchTotal":   marchTotal,
+			"marlist":      marlist,
+			"aprTotal":     aprTotal,
+			"aprlist":      aprlist,
+			"mayTotal":     mayTotal,
+			"maylist":      maylist,
+			"junTotal":     junTotal,
+			"junlist":      junlist,
+			"julTotal":     julTotal,
+			"jullist":      jullist,
+			"augTotal":     augTotal,
+			"auglist":      auglist,
+			"sepTotal":     sepTotal,
+			"seplist":      seplist,
+			"octTotal":     octTotal,
+			"octlist":      octlist,
+			"novTotal":     novTotal,
+			"novlist":      novlist,
+			"decTotal":     decTotal,
+			"declist":      declist,
 		})
 	}
 }
@@ -1946,15 +1945,37 @@ func (this *NewCommonApiController) GetSystolicBloodStand() {
 	fmt.Println(endtimeUnix)
 
 	//获取数据
-	recordList, err := service.GetDiastolicStand(orgId, startimeUnix, endtimeUnix)
+	//recordList, err := service.GetDiastolicStand(orgId, startimeUnix, endtimeUnix,page,limit)
 	bloodPressure, err := service.GetDefaultBloodPressure(orgId)
+	var sysMin string
+	var sysLarge string
+	var diaMin string
+	var diaLarge string
+	for index, value := range bloodPressure {
+		fmt.Println("index", index)
+		if value.InspectionMajor == 0 && value.InspectionMinor == -1 {
+			sysMin = value.MinRange
+			sysLarge = value.LargeRange
+		}
+		if value.InspectionMajor == 0 && value.InspectionMinor == -2 {
+			diaMin = value.MinRange
+			diaLarge = value.LargeRange
+		}
+	}
+	sysmin, err := strconv.ParseInt(sysMin, 10, 64)
+	syslarge, err := strconv.ParseInt(sysLarge, 10, 64)
+	diamin, err := strconv.ParseInt(diaMin, 10, 64)
+	dialarge, err := strconv.ParseInt(diaLarge, 10, 64)
+	recordtwo, err := service.TotalSysStandCountTwo(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge)
+	record, err := service.TotalSysStandCount(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge, page, limit)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"recordList":    recordList,
+		"record":        record,
 		"bloodPressure": bloodPressure,
+		"recordtwo":     recordtwo,
 	})
 }
 
@@ -1981,3 +2002,58 @@ func (this *NewCommonApiController) GetMobileIdsList() {
 		"vlist": vlist,
 	})
 }
+
+func (this *NewCommonApiController) GetSystolicBloodNoStand() {
+	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,page,limit)
+	bloodPressure, err := service.GetDefaultBloodPressure(orgId)
+	var sysMin string
+	var sysLarge string
+	var diaMin string
+	var diaLarge string
+	for index, value := range bloodPressure {
+		fmt.Println("index", index)
+		if value.InspectionMajor == 0 && value.InspectionMinor == -1 {
+			sysMin = value.MinRange
+			sysLarge = value.LargeRange
+		}
+		if value.InspectionMajor == 0 && value.InspectionMinor == -2 {
+			diaMin = value.MinRange
+			diaLarge = value.LargeRange
+		}
+	}
+	sysmin, err := strconv.ParseInt(sysMin, 10, 64)
+	syslarge, err := strconv.ParseInt(sysLarge, 10, 64)
+	diamin, err := strconv.ParseInt(diaMin, 10, 64)
+	dialarge, err := strconv.ParseInt(diaLarge, 10, 64)
+
+	recoredtwo, err := service.TotalSysNoStandCountTwo(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge)
+	record, err := service.TotalSysNoStandCount(orgId, startimeUnix, endtimeUnix, sysmin, syslarge, diamin, dialarge, page, limit)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"record":        record,
+		"bloodPressure": bloodPressure,
+		"recoredtwo":    recoredtwo,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -41,4 +41,5 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/gettargestanddetail", &NewCommonApiController{}, "Get:GetTargetStandDetail")
 	beego.Router("/m/api/getsystolicbloodstand", &NewCommonApiController{}, "Get:GetSystolicBloodStand")
 	beego.Router("/m/api/getmobileidslist", &NewCommonApiController{}, "post:GetMobileIdsList")
+	beego.Router("/m/api/getsystolicbloodnostand", &NewCommonApiController{}, "Get:GetSystolicBloodNoStand")
 }

models/device_models.go

@@ -869,3 +869,13 @@ func (DeviceMode) TableName() string {
 
 	return "xt_device_mode"
 }
+
+type VmDeviceInformation struct {
+	Total     int64
+	BedNumber int64 `gorm:"column:bed_number" json:"bed_number" form:"bed_number"`
+}
+
+func (VmDeviceInformation) TableName() string {
+
+	return "xt_device_information"
+}

service/common_service.go

@@ -3214,10 +3214,11 @@ 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) {
+func GetDiastolicStand(orgid int64, startime int64, endtime int64, page int64, limit 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
+	offset := (page - 1) * limit
+	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 and x.diastolic_blood_pressure <> 0)", orgid, startime, endtime).Offset(offset).Limit(limit).Group("x.monitoring_date,x.patient_id").Scan(&record).Error
 	return record, err
 }
 
@@ -3226,3 +3227,93 @@ func GetInspectionMoninList(id int64, orgid int64, patientid int64) (models.XtIn
 	err = XTReadDB().Model(&inspection).Where("item_id=? and org_id = ? and status = 1 and patient_id = ?", id, orgid, patientid).Last(&inspection).Error
 	return inspection, err
 }
+
+func TotalSysStandCountTwo(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	if sysmin > 0 {
+		db = db.Where(" x.systolic_blood_pressure>=?", sysmin)
+	}
+	if syslarge > 0 {
+		db = db.Where("x.systolic_blood_pressure<=?", syslarge)
+	}
+	if diamin > 0 {
+		db = db.Where(" x.diastolic_blood_pressure>=?", diamin)
+	}
+	if dialarge > 0 {
+		db = db.Where("x.diastolic_blood_pressure<=?", dialarge)
+	}
+	err = db.Select("x.id,x.user_org_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("s.status = 1").Group("x.monitoring_date,x.patient_id").Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}
+
+func TotalSysStandCount(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64, page int64, limit int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	if sysmin > 0 {
+		db = db.Where(" x.systolic_blood_pressure>=?", sysmin)
+	}
+	if syslarge > 0 {
+		db = db.Where("x.systolic_blood_pressure<=?", syslarge)
+	}
+	if diamin > 0 {
+		db = db.Where(" x.diastolic_blood_pressure>=?", diamin)
+	}
+	if dialarge > 0 {
+		db = db.Where("x.diastolic_blood_pressure<=?", dialarge)
+	}
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.user_org_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("s.status = 1").Group("x.monitoring_date,x.patient_id").Offset(offset).Limit(limit).Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}
+
+func TotalSysNoStandCountTwo(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	err = db.Select("x.id,x.user_org_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("s.status = 1 and(x.systolic_blood_pressure<=? or x.systolic_blood_pressure>=?) or (x.diastolic_blood_pressure<=? or x.diastolic_blood_pressure>=?)", sysmin, syslarge, diamin, dialarge).Group("x.monitoring_date,x.patient_id").Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}
+
+func TotalSysNoStandCount(orgid int64, startime int64, endtime int64, sysmin int64, syslarge int64, diamin int64, dialarge int64, page int64, limit int64) (record []*models.XTMonitoringRecords, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	if orgid > 0 {
+		db = db.Where("x.user_org_id = ? and x.systolic_blood_pressure<>0 and x.diastolic_blood_pressure<>0 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.monitoring_date>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.monitoring_date<=?", endtime)
+	}
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.user_org_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("s.status = 1 and(x.systolic_blood_pressure<=? or x.systolic_blood_pressure>=?) or (x.diastolic_blood_pressure<=? or x.diastolic_blood_pressure>=?)", sysmin, syslarge, diamin, dialarge).Group("x.monitoring_date,x.patient_id").Offset(offset).Limit(limit).Order("x.monitoring_date desc").Scan(&record).Error
+	return record, err
+}

service/manage_service.go

@@ -1112,3 +1112,96 @@ func GetOrgs(id int64) (roles []*models.SgjUserAdminRole, err error) {
 
 	return roles, err
 }
+
+func GetUserMachTotalCount(orgid int64) (vm []*models.VmDeviceInformation, err error) {
+
+	err = UserReadDB().Raw("SELECT x.bed_number,count(*) as total  FROM xt_device_information  as x WHERE user_org_id = ? and `status` = 1 GROUP BY x.bed_number ", orgid).Scan(&vm).Error
+	return vm, err
+}
+
+func GetUserTotalByMacher(id int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Model(&addmacher).Where("id=? and status = 1", id).Find(&addmacher).Error
+	return addmacher, err
+}
+
+func GetUserTotalCount(orgid int64, bedid int64) (vm []*models.VmDeviceInformation, err error) {
+
+	err = UserReadDB().Raw("SELECT x.bed_number,count(*) as total  FROM xt_device_information  as x WHERE user_org_id = ? and `status` = 1 and bed_number= ? GROUP BY x.bed_number ", orgid, bedid).Scan(&vm).Error
+	return vm, err
+
+}
+
+func GetUserTotal(orgid int64, id int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := UserReadDB().Model(&addmacher).Where("user_org_id = ? and bed_id = ? and status = 1", orgid, id).Find(&addmacher).Error
+	return addmacher, err
+}
+
+func GetDisInfectionTime(orgid int64, bedid int64, scheduletype int64, scheduleweek int64) (*models.DevicePlan, error) {
+	plan := models.DevicePlan{}
+	err = UserReadDB().Model(&plan).Where("user_org_id = ? and bed_id = ? and classtime = ? and time = ? and status = 1", orgid, bedid, scheduletype, scheduleweek).Find(&plan).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &plan, nil
+}
+
+func GetLaseDeviceInfomation(orgid int64, bedid int64) (models.DeviceInformation, error) {
+
+	information := models.DeviceInformation{}
+	err := UserReadDB().Model(&information).Where("bed_number = ? and user_org_id =? and status = 1", bedid, orgid).Last(&information).Error
+	return information, err
+}
+
+func GetAssessmentAfterDissDataTwo(patientid int64, orgID int64, timenow int64) (models.XtAssessmentAfterDislysis, error) {
+	dislysis := models.XtAssessmentAfterDislysis{}
+	err := XTReadDB().Where("patient_id = ? AND user_org_id = ? AND assessment_date = ?", patientid, orgID, timenow).Find(&dislysis).Error
+	return dislysis, err
+}
+
+func GetEquimentIDTwo(bedId int64, orgID int64) (models.DeviceAddmacher, error) {
+	addmacher := models.DeviceAddmacher{}
+	err := readUserDb.Model(&addmacher).Where("bed_id = ? AND user_org_id = ? AND status = ?", bedId, orgID, 1).Find(&addmacher).Error
+	return addmacher, err
+}
+
+func GetDisinfectionTwo(equitType int64, enquitType int64, orgID int64) (*models.DevicePlan, error) {
+	var plan models.DevicePlan
+	var err error
+	err = readUserDb.Model(&plan).Where("device_type = ? AND classtime = ? AND user_org_id = ? AND status = 1", equitType, enquitType, orgID).Find(&plan).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &plan, nil
+}
+
+func GetInforTwo(patientid int64, timenow int64, orgid int64, class int64) (*models.DeviceInformation, error) {
+	var pre models.DeviceInformation
+	var err error
+	err = readUserDb.Model(&pre).Where("patient_id = ? AND date = ? AND user_org_id = ? AND class = ? AND status = 1", patientid, timenow, orgid, class).Find(&pre).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &pre, nil
+}
+
+func GetPatientOrderInfo(schduledate int64, patientid int64, orgid int64) (models.XtDialysisOrder, error) {
+	order := models.XtDialysisOrder{}
+	err := XTReadDB().Model(&order).Where("dialysis_date = ? and patient_id = ? and user_org_id = ? and status = 1", schduledate, patientid, orgid).Find(&order).Error
+	return order, err
+}
+
+func CreateInformationTwo(information *models.DeviceInformation) error {
+	err := UserWriteDB().Create(&information).Error
+	return err
+}

service/mobile_dialysis_service.go

@@ -80,6 +80,7 @@ type MDialysisScheduleVM struct {
 	PatientId    int64 `gorm:"column:patient_id" json:"patient_id"`
 	ScheduleDate int64 `gorm:"column:schedule_date" json:"schedule_date"`
 	ScheduleType int64 `gorm:"column:schedule_type" json:"schedule_type"`
+	ScheduleWeek int64 `gorm:"column:schedule_week" json:"schedule_week"`
 	ModeId       int64 `gorm:"column:mode_id" json:"mode_id"`
 	Status       int64 `gorm:"column:status" json:"status"`