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 = sgj_xt
+readmysqlname = test_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = sgj_xt
+writemysqlname = test_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = sgj_users
+readusername = test_users
 
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = sgj_users
+writeusername = test_users
 
 
 

controllers/base_api_controller.go

@@ -69,36 +69,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 558
-		//userAdmin.Mobile = "13535547901"
-		//
-		////userAdmin.Id = 597
-		////userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 7957
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 7957
-		//adminUserInfo.CurrentAppId = 18
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 558
+		userAdmin.Mobile = "13535547901"
+
+		//userAdmin.Id = 597
+		//userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 9841
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 9841
+		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
@@ -326,7 +326,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 7957
+		subscibe.OrgId = 9841
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -336,7 +336,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 7957
+		adminUserInfo.CurrentOrgId = 9841
 		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/new_mobile_api_controllers/common_api_controller.go

@@ -124,6 +124,7 @@ func (this *CommonApiController) SaveConfiguration() {
 				RangeType:       checktype,
 				RangeValue:      rangvalue,
 				CreatedTime:     time.Now().Unix(),
+				IsStatus:        1,
 			}
 			fmt.Println(standard)
 			err = service.SaveInspection(&standard)
@@ -178,6 +179,7 @@ func (this *CommonApiController) GetConfigurationlist() {
 	major, _ := service.GetInspectionMajor(orgid)
 	if len(major) == 0 {
 		configurationlist, total, err := service.GetConfigurationlist(orgid, limit, page)
+		pressure, err := service.GetDefaultBloodPressure(orgid)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -185,9 +187,11 @@ func (this *CommonApiController) GetConfigurationlist() {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationlist": configurationlist,
 			"total":             total,
+			"pressure":          pressure,
 		})
 	} else {
 		configurationlist, total, err := service.GetConfigurationListTwo(orgid, limit, page)
+		pressure, err := service.GetDefaultBloodPressure(orgid)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -195,6 +199,7 @@ func (this *CommonApiController) GetConfigurationlist() {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationlist": configurationlist,
 			"total":             total,
+			"pressure":          pressure,
 		})
 	}
 
@@ -202,7 +207,7 @@ func (this *CommonApiController) GetConfigurationlist() {
 
 func (this *CommonApiController) GetConfigurationDetail() {
 	id, _ := this.GetInt64("id")
-	//fmt.Println("id是", id)
+	fmt.Println("id是", id)
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	detail, err := service.GetConfigurationDetail(id)
 	major, err := service.GetInspectionMajor(orgId)
@@ -1041,12 +1046,15 @@ func (this *CommonApiController) GetNormData() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	//获取系统数据
 	normdata, err := service.GetNormDataByOrgId(orgid)
+	//获取血压数据
+	bloodPressure, err := service.GetDefaultBloodPressure(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"normdata": normdata,
+		"normdata":      normdata,
+		"bloodPressure": bloodPressure,
 	})
 	//if len(normdata) == 0 {
 	//	normdata, err := service.GetNormData(0)
@@ -1090,13 +1098,31 @@ func (this *CommonApiController) GetFirstQuarter() {
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
 	//统计rang_type== 2
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
+
+	//获取收缩压数据
+	_, systolicTotal, parseDateErr := service.GetSystolicBloodPressure(orgid, statime, entime)
+	//统计收缩压合格的数据
+	systolic, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
+
+	//获取舒张压数据
+	_, diastotal, parseDateErr := service.GetDiastolicBloodPressure(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,
+		"count":          count,
+		"countwo":        countwo,
+		"systolic":       systolic,
+		"systolicTotal":  systolicTotal,
+		"sysstandTotal":  sysstandTotal,
+		"diastolic":      diastolic,
+		"diastotal":      diastotal,
+		"diasstandtotal": diasstandtotal,
+		"normData":       normData,
 	})
 }
 
@@ -1564,3 +1590,453 @@ func (this *CommonApiController) GetPatientComplianceDetail() {
 		"list": list,
 	})
 }
+
+func (this *CommonApiController) GetBloodPressureDetail() {
+	id, _ := this.GetInt64("id")
+	blooddetail, err := service.GetBloodPressureDetail(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"blooddetail": blooddetail,
+	})
+}
+
+func (this *CommonApiController) UpdateBloodPrussre() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id", id)
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	inspectionmajor := int64(dataBody["inspectionMajor"].(float64))
+	fmt.Println("inspectionmajor", inspectionmajor)
+	inspectionminor := int64(dataBody["inspectionMinor"].(float64))
+	fmt.Println("inspectionminor", inspectionminor)
+	largerange := dataBody["large_range"].(string)
+	fmt.Println(largerange)
+	minrange := dataBody["min_range"].(string)
+	fmt.Print(minrange)
+	sort := int64(dataBody["sort"].(float64))
+	fmt.Print("sort", sort)
+	standard := models.XtQualityControlStandard{
+		InspectionMajor: inspectionmajor,
+		InspectionMinor: inspectionminor,
+		MinRange:        minrange,
+		Sort:            sort,
+		LargeRange:      largerange,
+	}
+	err = service.UpdateBloodPressure(&standard, id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+
+		"standard": standard,
+	})
+}
+
+func (this *CommonApiController) GetBloodPressureList() {
+	adminUser := this.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
+	bloodType, _ := this.GetInt64("bloodType")
+	fmt.Println(bloodType)
+	firstQuarterStart := this.GetString("first_quarter_start")
+	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
+	firstQuarterStartUnix := firstQuarterStartStr.Unix()
+	fmt.Println("第一季度", firstQuarterStartUnix)
+	fisrtQuarterEnd := this.GetString("first_qurter_end")
+	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
+	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
+	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
+	fmt.Println("fisrtQuarterEndStrUnix", fisrtQuarterEndStrUnix)
+	secondeQuarterStart := this.GetString("second_qurter_start")
+	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
+	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
+	fmt.Println("secondeQuarterStartUnix", secondeQuarterStartUnix)
+	secondQuarterEnd := this.GetString("second_qurter_end")
+	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
+	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
+	fmt.Println("第二季度结束时间", secondQuarterEndStrUnix)
+
+	threeQuarterStart := this.GetString("three_qurter_start")
+	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
+	threeQuarterStartUnix := threeQuarterStartStr.Unix()
+	fmt.Println("第三季度", threeQuarterStartUnix)
+	threeQuarterEnd := this.GetString("three_qurter_end")
+	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
+	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
+	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
+	fmt.Println("第三季度", threeQuarterEndStrUnix)
+	fourQuarterStart := this.GetString("four_qurter_start")
+	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
+	fourQuarterStartUnix := fourQuarterStartStr.Unix()
+	fmt.Println("第四季度", fourQuarterStartUnix)
+	fourQuarterEnd := this.GetString("four_qurter_end")
+	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
+	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
+	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
+	fmt.Println("第四季度", fourQuarterEndStrUnix)
+	if bloodType == -1 {
+		//统计收缩压第一季度的总数
+		_, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//统计收缩压第一季合格的总数
+		_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//统计第二季收缩压总数
+		_, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//第二季度合格总数
+		_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//统计第三季收缩压总数
+		_, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//第三季度合格数
+		_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//第四季度总数
+		_, fourTotal, err := service.GetSystolicBloodPressure(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,
+		})
+	}
+
+	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)
+
+		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,
+		})
+	}
+}
+
+func (this *CommonApiController) GetMonthBloodList() {
+
+	bloodtype, _ := this.GetInt64("bloodType")
+	fmt.Println(bloodtype)
+	januaryStart := this.GetString("januaryStart")
+
+	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
+	januaryStartStrUnix := januaryStartStr.Unix()
+	fmt.Println(januaryStartStrUnix)
+	januaryEnd := this.GetString("januaryEnd")
+
+	januaryEndStr := januaryEnd + " 23:59:59"
+	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
+	januaryEndStrUnix := januaryEndStrs.Unix()
+	fmt.Println(januaryEndStrUnix)
+	febStart := this.GetString("febStart")
+
+	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
+	febStartStrStrUnix := febStartStr.Unix()
+	fmt.Println(febStartStrStrUnix)
+	febEnd := this.GetString("febEnd")
+
+	febEndStr := febEnd + " 23:59:59"
+	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
+	febEndStrUnix := febEndStrs.Unix()
+	fmt.Println(febEndStrUnix)
+	marchStart := this.GetString("marchStart")
+
+	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
+	marchStartStrUnix := marchStartStr.Unix()
+	fmt.Println(marchStartStrUnix)
+	marchEnd := this.GetString("marchEnd")
+
+	marchEndStr := marchEnd + " 23:59:59"
+	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
+	marchEndStrUnix := marchEndStrs.Unix()
+	fmt.Println(marchEndStrUnix)
+	aprStart := this.GetString("aprStart")
+
+	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
+	aprStartStrUnix := aprStartStr.Unix()
+	fmt.Println(aprStartStrUnix)
+	aprEnd := this.GetString("aprEnd")
+
+	aprEndStr := aprEnd + " 23:59:59"
+	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
+	aprEndStrsUnix := aprEndStrs.Unix()
+	fmt.Println(aprEndStrsUnix)
+	mayStart := this.GetString("mayStart")
+
+	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
+	mayStartStrUnix := mayStartStr.Unix()
+	fmt.Println(mayStartStrUnix)
+	mayEnd := this.GetString("mayEnd")
+
+	mayEndStr := mayEnd + " 23:59:59"
+	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
+	mayEndStrsUnix := mayEndStrs.Unix()
+	fmt.Println(mayEndStrsUnix)
+	junStart := this.GetString("junStart")
+
+	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
+	junStartStrUnix := junStartStr.Unix()
+	fmt.Println(junStartStrUnix)
+	junEnd := this.GetString("junEnd")
+
+	junEndStr := junEnd + " 23:59:59"
+	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
+	junEndStrsUnix := junEndStrs.Unix()
+	fmt.Println(junEndStrsUnix)
+	julStart := this.GetString("julStart")
+
+	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
+	julStartStrUnix := julStartStr.Unix()
+	fmt.Println(julStartStrUnix)
+	julEnd := this.GetString("julEnd")
+
+	julEndStr := julEnd + " 23:59:59"
+	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
+	julEndStrsUnix := julEndStrs.Unix()
+	fmt.Println(julEndStrsUnix)
+	augStart := this.GetString("augStart")
+
+	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
+	augStartStrUnix := augStartStr.Unix()
+	fmt.Print(augStartStrUnix)
+	augEnd := this.GetString("augEnd")
+
+	augEndStr := augEnd + " 23:59:59"
+	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
+	augEndStrsUnix := augEndStrs.Unix()
+	fmt.Println(augEndStrsUnix)
+	sepStart := this.GetString("sepStart")
+
+	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
+	sepStartStrUnix := sepStartStr.Unix()
+	fmt.Println(sepStartStrUnix)
+	sepEnd := this.GetString("sepEnd")
+
+	sepEndStr := sepEnd + " 23:59:59"
+	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
+	sepEndStrsUnix := sepEndStrs.Unix()
+	fmt.Println(sepEndStrsUnix)
+	octStart := this.GetString("octStart")
+
+	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
+	octStartStrUnix := octStartStr.Unix()
+	fmt.Println(octStartStrUnix)
+	octEnd := this.GetString("octEnd")
+
+	octEndStr := octEnd + " 23:59:59"
+	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
+	octEndStrsUnix := octEndStrs.Unix()
+	fmt.Println(octEndStrsUnix)
+	novStart := this.GetString("novStart")
+
+	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
+	novStartStrUnix := novStartStr.Unix()
+	fmt.Println(novStartStrUnix)
+	novEnd := this.GetString("novEnd")
+
+	novEndStr := novEnd + " 23:59:59"
+	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
+	novEndStrsUnix := novEndStrs.Unix()
+	fmt.Println(novEndStrsUnix)
+	decStart := this.GetString("decStart")
+
+	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
+	decStartStrUnix := decStartStr.Unix()
+	fmt.Println("12月使", decStartStrUnix)
+	decEnd := this.GetString("decEnd")
+
+	decEndStr := decEnd + " 23:59:59"
+	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
+	decEndStrsUnix := decEndStrs.Unix()
+	fmt.Println(decEndStrsUnix)
+
+	adminUser := this.GetAdminUserInfo()
+	orgId := adminUser.CurrentOrgId
+	//统计收缩压
+	if bloodtype == -1 {
+		//统计收缩压一月总数
+		_, 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)
+
+		//三月
+		_, 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)
+
+		//五月
+		_, 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)
+		//7月
+		_, 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)
+
+		//9月
+		_, 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)
+		//11月
+		_, 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)
+		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,
+		})
+	}
+
+	//统计舒张压
+	if bloodtype == -2 {
+		//统计收缩压一月总数
+		_, 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)
+
+		//三月
+		_, 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)
+
+		//五月
+		_, 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)
+		//7月
+		_, 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)
+
+		//9月
+		_, 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)
+		//11月
+		_, 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)
+		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,
+		})
+	}
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -51,4 +51,8 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/getqualitycontrol", &CommonApiController{}, "Get:GetQualityControl")
 	beego.Router("/com/api/gettreatlist", &CommonApiController{}, "Get:GetTreatlist")
 	beego.Router("/com/api/getpatientcompliancedetal", &CommonApiController{}, "Get:GetPatientComplianceDetail")
+	beego.Router("/com/api/getbloodpressuredetail", &CommonApiController{}, "Get:GetBloodPressureDetail")
+	beego.Router("/com/api/updatebloodprussre", &CommonApiController{}, "Post:UpdateBloodPrussre")
+	beego.Router("/com/api/getbloodpressurelist", &CommonApiController{}, "Get:GetBloodPressureList")
+	beego.Router("/com/api/getmonthbloodlist", &CommonApiController{}, "Get:GetMonthBloodList")
 }

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -395,6 +395,7 @@ func (this *NewCommonApiController) GetMobileNormdata() {
 	orgid := adminInfo.Org.Id
 	//获取系统数据
 	normdata, err := service.GetNormDataByOrgId(orgid)
+	bloodPressure, err := service.GetDefaultBloodPressure(orgid)
 	//if len(normdata) == 0 {
 	//	normdata, err := service.GetNormData(0)
 	//	if err != nil {
@@ -410,7 +411,8 @@ func (this *NewCommonApiController) GetMobileNormdata() {
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"normdata": normdata,
+		"normdata":      normdata,
+		"bloodPressure": bloodPressure,
 	})
 }
 
@@ -518,13 +520,30 @@ 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, sysstandTotal, parseDateErr := service.GetStandSystolicBloodPressure(orgid, statime, entime)
+
+	//获取舒张压数据
+	_, diastotal, parseDateErr := service.GetDiastolicBloodPressure(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,
+		"count":          count,
+		"countwo":        countwo,
+		"systolic":       systolic,
+		"systolicTotal":  systolicTotal,
+		"sysstandTotal":  sysstandTotal,
+		"diastolic":      diastolic,
+		"diastotal":      diastotal,
+		"diasstandtotal": diasstandtotal,
+		"normData":       normData,
 	})
 }
 
@@ -964,3 +983,943 @@ func (this *NewCommonApiController) GetPatientComplianceDetail() {
 		"list": list,
 	})
 }
+
+func (this *NewCommonApiController) GetMoblieBloodList() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgId := adminInfo.Org.Id
+	bloodType, _ := this.GetInt64("bloodType")
+	fmt.Println(bloodType)
+	firstQuarterStart := this.GetString("first_quarter_start")
+	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
+	firstQuarterStartUnix := firstQuarterStartStr.Unix()
+	fmt.Println("第一季度", firstQuarterStartUnix)
+	fisrtQuarterEnd := this.GetString("first_qurter_end")
+	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
+	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
+	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
+	fmt.Println("fisrtQuarterEndStrUnix", fisrtQuarterEndStrUnix)
+	secondeQuarterStart := this.GetString("second_qurter_start")
+	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
+	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
+	fmt.Println("secondeQuarterStartUnix", secondeQuarterStartUnix)
+	secondQuarterEnd := this.GetString("second_qurter_end")
+	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
+	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
+	fmt.Println("第二季度结束时间", secondQuarterEndStrUnix)
+
+	threeQuarterStart := this.GetString("three_qurter_start")
+	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
+	threeQuarterStartUnix := threeQuarterStartStr.Unix()
+	fmt.Println("第三季度", threeQuarterStartUnix)
+	threeQuarterEnd := this.GetString("three_qurter_end")
+	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
+	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
+	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
+	fmt.Println("第三季度", threeQuarterEndStrUnix)
+	fourQuarterStart := this.GetString("four_qurter_start")
+	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
+	fourQuarterStartUnix := fourQuarterStartStr.Unix()
+	fmt.Println("第四季度", fourQuarterStartUnix)
+	fourQuarterEnd := this.GetString("four_qurter_end")
+	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
+	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
+	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
+	fmt.Println("第四季度", fourQuarterEndStrUnix)
+	if bloodType == -1 {
+		//统计收缩压第一季度的总数
+		_, firstTotal, err := service.GetSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//统计收缩压第一季合格的总数
+		_, firstStandTotal, err := service.GetStandSystolicBloodPressure(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+		//统计第二季收缩压总数
+		_, secondeTotal, err := service.GetSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//第二季度合格总数
+		_, secondeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+		//统计第三季收缩压总数
+		_, threeTotal, err := service.GetSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//第三季度合格数
+		_, threeStandTotal, err := service.GetStandSystolicBloodPressure(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+		//第四季度总数
+		_, fourTotal, err := service.GetSystolicBloodPressure(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,
+		})
+	}
+	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)
+
+		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,
+		})
+	}
+}
+
+func (this *NewCommonApiController) GetBloodMonthList() {
+	bloodtype, _ := this.GetInt64("bloodType")
+	fmt.Println(bloodtype)
+	januaryStart := this.GetString("januaryStart")
+
+	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
+	januaryStartStrUnix := januaryStartStr.Unix()
+	fmt.Println(januaryStartStrUnix)
+	januaryEnd := this.GetString("januaryEnd")
+
+	januaryEndStr := januaryEnd + " 23:59:59"
+	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
+	januaryEndStrUnix := januaryEndStrs.Unix()
+	fmt.Println(januaryEndStrUnix)
+	febStart := this.GetString("febStart")
+
+	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
+	febStartStrStrUnix := febStartStr.Unix()
+	fmt.Println(febStartStrStrUnix)
+	febEnd := this.GetString("febEnd")
+
+	febEndStr := febEnd + " 23:59:59"
+	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
+	febEndStrUnix := febEndStrs.Unix()
+	fmt.Println(febEndStrUnix)
+	marchStart := this.GetString("marchStart")
+
+	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
+	marchStartStrUnix := marchStartStr.Unix()
+	fmt.Println(marchStartStrUnix)
+	marchEnd := this.GetString("marchEnd")
+
+	marchEndStr := marchEnd + " 23:59:59"
+	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
+	marchEndStrUnix := marchEndStrs.Unix()
+	fmt.Println(marchEndStrUnix)
+	aprStart := this.GetString("aprStart")
+
+	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
+	aprStartStrUnix := aprStartStr.Unix()
+	fmt.Println(aprStartStrUnix)
+	aprEnd := this.GetString("aprEnd")
+
+	aprEndStr := aprEnd + " 23:59:59"
+	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
+	aprEndStrsUnix := aprEndStrs.Unix()
+	fmt.Println(aprEndStrsUnix)
+	mayStart := this.GetString("mayStart")
+
+	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
+	mayStartStrUnix := mayStartStr.Unix()
+	fmt.Println(mayStartStrUnix)
+	mayEnd := this.GetString("mayEnd")
+
+	mayEndStr := mayEnd + " 23:59:59"
+	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
+	mayEndStrsUnix := mayEndStrs.Unix()
+	fmt.Println(mayEndStrsUnix)
+	junStart := this.GetString("junStart")
+
+	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
+	junStartStrUnix := junStartStr.Unix()
+	fmt.Println(junStartStrUnix)
+	junEnd := this.GetString("junEnd")
+
+	junEndStr := junEnd + " 23:59:59"
+	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
+	junEndStrsUnix := junEndStrs.Unix()
+	fmt.Println(junEndStrsUnix)
+	julStart := this.GetString("julStart")
+
+	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
+	julStartStrUnix := julStartStr.Unix()
+	fmt.Println(julStartStrUnix)
+	julEnd := this.GetString("julEnd")
+
+	julEndStr := julEnd + " 23:59:59"
+	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
+	julEndStrsUnix := julEndStrs.Unix()
+	fmt.Println(julEndStrsUnix)
+	augStart := this.GetString("augStart")
+
+	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
+	augStartStrUnix := augStartStr.Unix()
+	fmt.Print(augStartStrUnix)
+	augEnd := this.GetString("augEnd")
+
+	augEndStr := augEnd + " 23:59:59"
+	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
+	augEndStrsUnix := augEndStrs.Unix()
+	fmt.Println(augEndStrsUnix)
+	sepStart := this.GetString("sepStart")
+
+	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
+	sepStartStrUnix := sepStartStr.Unix()
+	fmt.Println(sepStartStrUnix)
+	sepEnd := this.GetString("sepEnd")
+
+	sepEndStr := sepEnd + " 23:59:59"
+	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
+	sepEndStrsUnix := sepEndStrs.Unix()
+	fmt.Println(sepEndStrsUnix)
+	octStart := this.GetString("octStart")
+
+	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
+	octStartStrUnix := octStartStr.Unix()
+	fmt.Println(octStartStrUnix)
+	octEnd := this.GetString("octEnd")
+
+	octEndStr := octEnd + " 23:59:59"
+	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
+	octEndStrsUnix := octEndStrs.Unix()
+	fmt.Println(octEndStrsUnix)
+	novStart := this.GetString("novStart")
+
+	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
+	novStartStrUnix := novStartStr.Unix()
+	fmt.Println(novStartStrUnix)
+	novEnd := this.GetString("novEnd")
+
+	novEndStr := novEnd + " 23:59:59"
+	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
+	novEndStrsUnix := novEndStrs.Unix()
+	fmt.Println(novEndStrsUnix)
+	decStart := this.GetString("decStart")
+
+	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
+	decStartStrUnix := decStartStr.Unix()
+	fmt.Println("12月使", decStartStrUnix)
+	decEnd := this.GetString("decEnd")
+
+	decEndStr := decEnd + " 23:59:59"
+	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
+	decEndStrsUnix := decEndStrs.Unix()
+	fmt.Println(decEndStrsUnix)
+
+	adminUser := this.GetMobileAdminUserInfo()
+	orgId := adminUser.Org.Id
+
+	//统计收缩压
+	if bloodtype == -1 {
+		//统计收缩压一月总数
+		_, 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)
+
+		//三月
+		_, 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)
+
+		//五月
+		_, 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)
+		//7月
+		_, 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)
+
+		//9月
+		_, 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)
+		//11月
+		_, 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)
+		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,
+		})
+	}
+
+	//统计舒张压
+	if bloodtype == -2 {
+		//统计收缩压一月总数
+		_, 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)
+
+		//三月
+		_, 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)
+
+		//五月
+		_, 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)
+		//7月
+		_, 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)
+
+		//9月
+		_, 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)
+		//11月
+		_, 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)
+		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,
+		})
+	}
+}
+
+func (this *NewCommonApiController) GetQuarterTargeList() {
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgId := adminInfo.Org.Id
+	fmt.Println(orgId)
+	firstQuarterStart := this.GetString("first_quarter_start")
+	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
+	firstQuarterStartUnix := firstQuarterStartStr.Unix()
+	fmt.Println("第一季度", firstQuarterStartUnix)
+	fisrtQuarterEnd := this.GetString("first_qurter_end")
+	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
+	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
+	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
+	fmt.Println("fisrtQuarterEndStrUnix", fisrtQuarterEndStrUnix)
+	secondeQuarterStart := this.GetString("second_qurter_start")
+	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
+	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
+	fmt.Println("secondeQuarterStartUnix", secondeQuarterStartUnix)
+	secondQuarterEnd := this.GetString("second_qurter_end")
+	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
+	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
+	fmt.Println("第二季度结束时间", secondQuarterEndStrUnix)
+
+	threeQuarterStart := this.GetString("three_qurter_start")
+	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
+	threeQuarterStartUnix := threeQuarterStartStr.Unix()
+	fmt.Println("第三季度", threeQuarterStartUnix)
+	threeQuarterEnd := this.GetString("three_qurter_end")
+	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
+	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
+	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
+	fmt.Println("第三季度", threeQuarterEndStrUnix)
+	fourQuarterStart := this.GetString("four_qurter_start")
+	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
+	fourQuarterStartUnix := fourQuarterStartStr.Unix()
+	fmt.Println("第四季度", fourQuarterStartUnix)
+	fourQuarterEnd := this.GetString("four_qurter_end")
+	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
+	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
+	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
+	fmt.Println("第四季度", fourQuarterEndStrUnix)
+
+	//统计指标合格的
+	stand, err := service.GetQuarterTargeStand(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+	//统计不合格的
+	noStand, err := service.GetQuarterTargeNoStand(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+
+	//统计阴阳性合格的
+	contagionTargeStand, err := service.GetContagionQuarterTargeStand(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+	//统计阴阳性不合格的
+	contagionTargeNoStand, err := service.GetContagionTargeNoStand(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stand":                 stand,
+		"noStand":               noStand,
+		"contagionTargeStand":   contagionTargeStand,
+		"contagionTargeNoStand": contagionTargeNoStand,
+	})
+}
+
+func (this *NewCommonApiController) GetMonthTarget() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgId := adminInfo.Org.Id
+	fmt.Println(orgId)
+
+	januaryStart := this.GetString("januaryStart")
+	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
+	januaryStartStrUnix := januaryStartStr.Unix()
+
+	januaryEnd := this.GetString("januaryEnd")
+	januaryEndStr := januaryEnd + " 23:59:59"
+	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
+	januaryEndStrUnix := januaryEndStrs.Unix()
+
+	febStart := this.GetString("febStart")
+	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
+	febStartStrStrUnix := febStartStr.Unix()
+
+	febEnd := this.GetString("febEnd")
+	febEndStr := febEnd + " 23:59:59"
+	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
+	febEndStrUnix := febEndStrs.Unix()
+
+	marchStart := this.GetString("marchStart")
+	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
+	marchStartStrUnix := marchStartStr.Unix()
+	marchEnd := this.GetString("marchEnd")
+
+	marchEndStr := marchEnd + " 23:59:59"
+	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
+	marchEndStrUnix := marchEndStrs.Unix()
+
+	aprStart := this.GetString("aprStart")
+	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
+	aprStartStrUnix := aprStartStr.Unix()
+
+	aprEnd := this.GetString("aprEnd")
+	aprEndStr := aprEnd + " 23:59:59"
+	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
+	aprEndStrsUnix := aprEndStrs.Unix()
+
+	mayStart := this.GetString("mayStart")
+
+	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
+	mayStartStrUnix := mayStartStr.Unix()
+
+	mayEnd := this.GetString("mayEnd")
+
+	mayEndStr := mayEnd + " 23:59:59"
+	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
+	mayEndStrsUnix := mayEndStrs.Unix()
+
+	junStart := this.GetString("junStart")
+
+	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
+	junStartStrUnix := junStartStr.Unix()
+
+	junEnd := this.GetString("junEnd")
+
+	junEndStr := junEnd + " 23:59:59"
+	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
+	junEndStrsUnix := junEndStrs.Unix()
+
+	julStart := this.GetString("julStart")
+
+	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
+	julStartStrUnix := julStartStr.Unix()
+
+	julEnd := this.GetString("julEnd")
+
+	julEndStr := julEnd + " 23:59:59"
+	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
+	julEndStrsUnix := julEndStrs.Unix()
+
+	augStart := this.GetString("augStart")
+
+	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
+	augStartStrUnix := augStartStr.Unix()
+
+	augEnd := this.GetString("augEnd")
+
+	augEndStr := augEnd + " 23:59:59"
+	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
+	augEndStrsUnix := augEndStrs.Unix()
+
+	sepStart := this.GetString("sepStart")
+
+	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
+	sepStartStrUnix := sepStartStr.Unix()
+	fmt.Println("九月使", sepStartStrUnix)
+	sepEnd := this.GetString("sepEnd")
+
+	sepEndStr := sepEnd + " 23:59:59"
+	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
+	sepEndStrsUnix := sepEndStrs.Unix()
+
+	octStart := this.GetString("octStart")
+
+	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
+	octStartStrUnix := octStartStr.Unix()
+
+	octEnd := this.GetString("octEnd")
+
+	octEndStr := octEnd + " 23:59:59"
+	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
+	octEndStrsUnix := octEndStrs.Unix()
+
+	novStart := this.GetString("novStart")
+	//fmt.Println("11月始", novStart)
+	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
+	novStartStrUnix := novStartStr.Unix()
+
+	novEnd := this.GetString("novEnd")
+
+	novEndStr := novEnd + " 23:59:59"
+	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
+	novEndStrsUnix := novEndStrs.Unix()
+
+	decStart := this.GetString("decStart")
+
+	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
+	decStartStrUnix := decStartStr.Unix()
+
+	decEnd := this.GetString("decEnd")
+
+	decEndStr := decEnd + " 23:59:59"
+	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
+	decEndStrsUnix := decEndStrs.Unix()
+
+	//统计指标合格的
+	stand, err := service.GetMonthTargetStand(orgId, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+	//统计不合格的指标
+	nostand, err := service.GetMonthTargetNoStand(orgId, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+
+	//统计传染类型合格的指标
+	contagionTargeStand, err := service.GetMonthcontagionTargeStand(orgId, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+	//统计传染类型不合格的指标
+	contagionTargeNoStand, err := service.GetMonthcontagionTargeNoStand(orgId, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"stand":                 stand,
+		"nostand":               nostand,
+		"contagionTargeStand":   contagionTargeStand,
+		"contagionTargeNoStand": contagionTargeNoStand,
+	})
+}
+
+func (this *NewCommonApiController) GetQuarterBloodList() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgId := adminInfo.Org.Id
+	fmt.Println(orgId)
+	firstQuarterStart := this.GetString("first_quarter_start")
+	firstQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", firstQuarterStart)
+	firstQuarterStartUnix := firstQuarterStartStr.Unix()
+	fmt.Println("第一季度", firstQuarterStartUnix)
+	fisrtQuarterEnd := this.GetString("first_qurter_end")
+	fisrtQuarterEndStr := fisrtQuarterEnd + " 23:59:59"
+	fisrtQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fisrtQuarterEndStr)
+	fisrtQuarterEndStrUnix := fisrtQuarterEnds.Unix()
+	fmt.Println("fisrtQuarterEndStrUnix", fisrtQuarterEndStrUnix)
+	secondeQuarterStart := this.GetString("second_qurter_start")
+	secondeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", secondeQuarterStart)
+	secondeQuarterStartUnix := secondeQuarterStartStr.Unix()
+	fmt.Println("secondeQuarterStartUnix", secondeQuarterStartUnix)
+	secondQuarterEnd := this.GetString("second_qurter_end")
+	secondQuarterEndStr := secondQuarterEnd + " 23:59:59"
+	secondQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	secondQuarterEndStrUnix := secondQuarterEnds.Unix()
+	fmt.Println("第二季度结束时间", secondQuarterEndStrUnix)
+
+	threeQuarterStart := this.GetString("three_qurter_start")
+	threeQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", threeQuarterStart)
+	threeQuarterStartUnix := threeQuarterStartStr.Unix()
+	fmt.Println("第三季度", threeQuarterStartUnix)
+	threeQuarterEnd := this.GetString("three_qurter_end")
+	threeQuarterEndStr := threeQuarterEnd + " 23:59:59"
+	threeQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", threeQuarterEndStr)
+	threeQuarterEndStrUnix := threeQuarterEnds.Unix()
+	fmt.Println("第三季度", threeQuarterEndStrUnix)
+	fourQuarterStart := this.GetString("four_qurter_start")
+	fourQuarterStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", fourQuarterStart)
+	fourQuarterStartUnix := fourQuarterStartStr.Unix()
+	fmt.Println("第四季度", fourQuarterStartUnix)
+	fourQuarterEnd := this.GetString("four_qurter_end")
+	fourQuarterEndStr := fourQuarterEnd + " 23:59:59"
+	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
+	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
+	fmt.Println("第四季度", fourQuarterEndStrUnix)
+
+	//获取一季度透析检测数据
+	firtstlist, err := service.GetQuarterBloodList(orgId, firstQuarterStartUnix, fisrtQuarterEndStrUnix)
+	//获取第二季度透析监测数据
+	secondlist, err := service.GetQuarterBloodList(orgId, secondeQuarterStartUnix, secondQuarterEndStrUnix)
+	//获取第三季度透析监测数据
+	threelist, err := service.GetQuarterBloodList(orgId, threeQuarterStartUnix, threeQuarterEndStrUnix)
+	//获取第二季度透析监测数据
+	fourlist, err := service.GetQuarterBloodList(orgId, fourQuarterStartUnix, fourQuarterEndStrUnix)
+
+	bloodPressure, err := service.GetDefaultBloodPressure(orgId)
+
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"firtstlist":    firtstlist,
+		"secondlist":    secondlist,
+		"threelist":     threelist,
+		"fourlist":      fourlist,
+		"bloodPressure": bloodPressure,
+	})
+
+}
+
+func (this *NewCommonApiController) GetMonthBLoodList() {
+
+	adminInfo := this.GetMobileAdminUserInfo()
+	orgId := adminInfo.Org.Id
+	fmt.Println(orgId)
+
+	januaryStart := this.GetString("januaryStart")
+	januaryStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", januaryStart)
+	januaryStartStrUnix := januaryStartStr.Unix()
+
+	januaryEnd := this.GetString("januaryEnd")
+	januaryEndStr := januaryEnd + " 23:59:59"
+	januaryEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", januaryEndStr)
+	januaryEndStrUnix := januaryEndStrs.Unix()
+
+	febStart := this.GetString("febStart")
+	febStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", febStart)
+	febStartStrStrUnix := febStartStr.Unix()
+
+	febEnd := this.GetString("febEnd")
+	febEndStr := febEnd + " 23:59:59"
+	febEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", febEndStr)
+	febEndStrUnix := febEndStrs.Unix()
+
+	marchStart := this.GetString("marchStart")
+	marchStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", marchStart)
+	marchStartStrUnix := marchStartStr.Unix()
+	marchEnd := this.GetString("marchEnd")
+
+	marchEndStr := marchEnd + " 23:59:59"
+	marchEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", marchEndStr)
+	marchEndStrUnix := marchEndStrs.Unix()
+
+	aprStart := this.GetString("aprStart")
+	aprStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", aprStart)
+	aprStartStrUnix := aprStartStr.Unix()
+
+	aprEnd := this.GetString("aprEnd")
+	aprEndStr := aprEnd + " 23:59:59"
+	aprEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", aprEndStr)
+	aprEndStrsUnix := aprEndStrs.Unix()
+
+	mayStart := this.GetString("mayStart")
+
+	mayStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", mayStart)
+	mayStartStrUnix := mayStartStr.Unix()
+
+	mayEnd := this.GetString("mayEnd")
+
+	mayEndStr := mayEnd + " 23:59:59"
+	mayEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", mayEndStr)
+	mayEndStrsUnix := mayEndStrs.Unix()
+
+	junStart := this.GetString("junStart")
+
+	junStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", junStart)
+	junStartStrUnix := junStartStr.Unix()
+
+	junEnd := this.GetString("junEnd")
+
+	junEndStr := junEnd + " 23:59:59"
+	junEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", junEndStr)
+	junEndStrsUnix := junEndStrs.Unix()
+
+	julStart := this.GetString("julStart")
+
+	julStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", julStart)
+	julStartStrUnix := julStartStr.Unix()
+
+	julEnd := this.GetString("julEnd")
+
+	julEndStr := julEnd + " 23:59:59"
+	julEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", julEndStr)
+	julEndStrsUnix := julEndStrs.Unix()
+
+	augStart := this.GetString("augStart")
+
+	augStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", augStart)
+	augStartStrUnix := augStartStr.Unix()
+
+	augEnd := this.GetString("augEnd")
+
+	augEndStr := augEnd + " 23:59:59"
+	augEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", augEndStr)
+	augEndStrsUnix := augEndStrs.Unix()
+
+	sepStart := this.GetString("sepStart")
+
+	sepStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", sepStart)
+	sepStartStrUnix := sepStartStr.Unix()
+	fmt.Println("九月使", sepStartStrUnix)
+	sepEnd := this.GetString("sepEnd")
+
+	sepEndStr := sepEnd + " 23:59:59"
+	sepEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", sepEndStr)
+	sepEndStrsUnix := sepEndStrs.Unix()
+
+	octStart := this.GetString("octStart")
+
+	octStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", octStart)
+	octStartStrUnix := octStartStr.Unix()
+
+	octEnd := this.GetString("octEnd")
+
+	octEndStr := octEnd + " 23:59:59"
+	octEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", octEndStr)
+	octEndStrsUnix := octEndStrs.Unix()
+
+	novStart := this.GetString("novStart")
+	//fmt.Println("11月始", novStart)
+	novStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", novStart)
+	novStartStrUnix := novStartStr.Unix()
+
+	novEnd := this.GetString("novEnd")
+
+	novEndStr := novEnd + " 23:59:59"
+	novEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", novEndStr)
+	novEndStrsUnix := novEndStrs.Unix()
+
+	decStart := this.GetString("decStart")
+
+	decStartStr, _ := utils.ParseTimeStringToTime("2006-01-02", decStart)
+	decStartStrUnix := decStartStr.Unix()
+
+	decEnd := this.GetString("decEnd")
+
+	decEndStr := decEnd + " 23:59:59"
+	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
+	decEndStrsUnix := decEndStrs.Unix()
+
+	//获取一月透析检测数据
+	januaryList, err := service.GetQuarterBloodList(orgId, januaryStartStrUnix, januaryEndStrUnix)
+
+	//获取二月透析监测数据
+	febList, err := service.GetQuarterBloodList(orgId, febStartStrStrUnix, febEndStrUnix)
+	//获取三月透析监测数据
+	marList, err := service.GetQuarterBloodList(orgId, marchStartStrUnix, marchEndStrUnix)
+	//4月
+	aprList, err := service.GetQuarterBloodList(orgId, aprStartStrUnix, aprEndStrsUnix)
+	//5月
+	mayList, err := service.GetQuarterBloodList(orgId, mayStartStrUnix, mayEndStrsUnix)
+	//6月
+	junList, err := service.GetQuarterBloodList(orgId, junStartStrUnix, junEndStrsUnix)
+	//7月
+	julList, err := service.GetQuarterBloodList(orgId, julStartStrUnix, julEndStrsUnix)
+	//8月
+	augList, err := service.GetQuarterBloodList(orgId, augStartStrUnix, augEndStrsUnix)
+	//9月
+	sepList, err := service.GetQuarterBloodList(orgId, sepStartStrUnix, sepEndStrsUnix)
+	//10月
+	octList, err := service.GetQuarterBloodList(orgId, octStartStrUnix, octEndStrsUnix)
+	//11月
+	novList, err := service.GetQuarterBloodList(orgId, novStartStrUnix, novEndStrsUnix)
+	//12月
+	decList, err := service.GetQuarterBloodList(orgId, decStartStrUnix, decEndStrsUnix)
+
+	bloodPressure, err := service.GetDefaultBloodPressure(orgId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"januaryList":   januaryList,
+		"febList":       febList,
+		"marList":       marList,
+		"aprList":       aprList,
+		"mayList":       mayList,
+		"junList":       junList,
+		"julList":       julList,
+		"augList":       augList,
+		"sepList":       sepList,
+		"octList":       octList,
+		"novList":       novList,
+		"decList":       decList,
+		"bloodPressure": bloodPressure,
+	})
+}
+
+func (this *NewCommonApiController) GetTargetNoStandDetail() {
+
+	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)
+
+	//获取未达标的详情页病人列表
+	inspectlist, err := service.GetTaregetNoStandDetail(orgId, startimeUnix, endtimeUnix)
+	//获取传染病类型为达标
+	configurationlist, err := service.GetConfigurationNoStandDetail(orgId, startimeUnix, endtimeUnix)
+
+	list, err := service.GetInspectNoStandList(orgId, startimeUnix, endtimeUnix, limit, page)
+	//分页
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"inspectlist":       inspectlist,
+		"configurationlist": configurationlist,
+		"list":              list,
+	})
+}
+
+func (this *NewCommonApiController) GetTargetStandDetail() {
+
+	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)
+	//获取达标数据
+	standlist, err := service.GetTargetStandDetail(orgId, startimeUnix, endtimeUnix)
+
+	//获取达标数据
+	confstandlist, err := service.GetConfigurationStandDetail(orgId, startimeUnix, endtimeUnix)
+
+	//分页
+	inspectlist, err := service.GetStandList(orgId, startimeUnix, endtimeUnix, limit, page)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"standlist":     standlist,
+		"confstandlist": confstandlist,
+		"inspectlist":   inspectlist,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -31,4 +31,12 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/toseachpatientscontrol", &NewCommonApiController{}, "Get:GetSeachPatientsControl")
 	beego.Router("/m/api/getmobiletreatlist", &NewCommonApiController{}, "Get:GetMobileTreatlist")
 	beego.Router("/m/api/getlistpatientdetail", &NewCommonApiController{}, "Get:GetPatientComplianceDetail")
+	beego.Router("/m/api/getmobilebloodlist", &NewCommonApiController{}, "Get:GetMoblieBloodList")
+	beego.Router("/m/api/getbloodmonthlist", &NewCommonApiController{}, "Get:GetBloodMonthList")
+	beego.Router("/m/api/getquarterTargelist", &NewCommonApiController{}, "Get:GetQuarterTargeList")
+	beego.Router("/m/api/getmonthtarge", &NewCommonApiController{}, "Get:GetMonthTarget")
+	beego.Router("/m/api/getquarterbloodlist", &NewCommonApiController{}, "Get:GetQuarterBloodList")
+	beego.Router("/m/api/getmonthbloolist", &NewCommonApiController{}, "Get:GetMonthBLoodList")
+	beego.Router("/m/api/gettargetnostanddetail", &NewCommonApiController{}, "Get:GetTargetNoStandDetail")
+	beego.Router("/m/api/gettargestanddetail", &NewCommonApiController{}, "Get:GetTargetStandDetail")
 }

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -1178,10 +1178,23 @@ func (this *NewDialysisApiController) GetDoctorAdviceDetail() {
 
 func (this *NewDialysisApiController) DeleteManagement() {
 	groupno, _ := this.GetInt64("id")
-	fmt.Print("id是什么", groupno)
+	patientid, _ := this.GetInt64("patientid")
+	patient, _ := service.GetPatientDetailTwo(patientid)
 	orgId := this.GetMobileAdminUserInfo().Org.Id
-	fmt.Print("机构ID", orgId)
-	err := service.DeleteManagement(groupno, orgId)
+	err := service.DeleteManagement(groupno, orgId, patient.BloodId)
+	fmt.Println("错误是什么", err)
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	this.ServeSuccessJSON(returnData)
+	return
+}
+
+func (this *NewDialysisApiController) DeleteManageMentTwo() {
+	groupno, _ := this.GetInt64("id")
+	patientid, _ := this.GetInt64("patientid")
+	fmt.Println("patientid------------------------------------", patientid)
+	orgId := this.GetMobileAdminUserInfo().Org.Id
+	err := service.DeleteManagement(groupno, orgId, patientid)
 	fmt.Println("错误是什么", err)
 	returnData := make(map[string]interface{}, 0)
 	returnData["msg"] = "ok"
@@ -2637,45 +2650,9 @@ func (this *NewDialysisApiController) GetNewPatientId() {
 
 func (this *NewDialysisApiController) UpdateImage() {
 
-	adminUserInfo := this.GetMobileAdminUserInfo()
-
-	es, _ := service.GetPatinentHead(adminUserInfo.Org.Id, adminUserInfo.App.Id, adminUserInfo.AdminUser.Id)
-
-	action := "update"
-	timeNow := time.Now().Unix()
-	if es == nil {
-		es = new(models.SgjUserAdminPatientHead)
-		es.Status = 1
-		es.UserOrgId = adminUserInfo.Org.Id
-		es.AppId = adminUserInfo.App.Id
-		es.Ctime = timeNow
-		es.Creator = adminUserInfo.AdminUser.Id
-		action = "create"
-	}
-	es.Mtime = timeNow
-
-	var esdata models.SgjUserAdminPatientHead
-	var err error
-	if err = json.Unmarshal(this.Ctx.Input.RequestBody, &esdata); err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
-
-	es.Hash = esdata.Hash
-	es.Url = beego.AppConfig.String("qiniu_domain") + esdata.Hash
-
-	if action == "create" {
-		err = service.CreateAdminUserHead(es)
-	} else {
-		err = service.SaveAdminUserHead(es)
-	}
-	if err != nil {
-		fmt.Println(err)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
-		return
-	}
-	fmt.Println("esss-================", es)
+	hash := this.GetString("hash")
+	var Url = beego.AppConfig.String("qiniu_domain") + hash
 	this.ServeSuccessJSON(map[string]interface{}{
-		"electronic_signature": es,
+		"electronic_signature": Url,
 	})
 }

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -155,5 +155,6 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getmobile", &NewDialysisApiController{}, "Get:GetMobile")
 	beego.Router("/m/api/patient/getorgs", &NewDialysisApiController{}, "Get:GetOrgs")
 	beego.Router("/m/api/patient/getnewpatientid", &NewDialysisApiController{}, "Get:GetNewPatientId")
-	beego.Router("/m/api/patient/updateimage", &NewDialysisApiController{}, "Post:UpdateImage")
+	beego.Router("/m/api/patient/updateimage", &NewDialysisApiController{}, "Get:UpdateImage")
+	beego.Router("/m/api/patient/deletemanagementtwo", &NewDialysisApiController{}, "Delete:DeleteManageMentTwo")
 }

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 {
@@ -393,6 +395,11 @@ type ProjectCountOne struct {
 	NoCount int64
 }
 
+type ProjectCountTwo struct {
+	Name  string
+	Count int64
+}
+
 type ProjectCount struct {
 	Total string
 	Count int64
@@ -472,3 +479,85 @@ type TreatTotalStruct struct {
 	Number string `json:"number"`
 	ModeID string `json:"mode_id"`
 }
+
+type XTMonitoringRecord 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"`
+	DialysisOrderId           int64   `gorm:"column:dialysis_order_id" json:"dialysis_order_id"`
+	MonitoringDate            int64   `gorm:"column:monitoring_date" json:"monitoring_date"`
+	OperateTime               int64   `gorm:"column:operate_time" json:"operate_time"`
+	MonitoringTime            string  `gorm:"column:monitoring_time" json:"monitoring_time"`
+	PulseFrequency            float64 `gorm:"column:pulse_frequency" json:"pulse_frequency"`
+	BreathingRate             float64 `gorm:"column:breathing_rate" json:"breathing_rate"`
+	SystolicBloodPressure     float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure    float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+	BloodPressureType         int64   `gorm:"column:blood_pressure_type" json:"blood_pressure_type"`
+	Pic                       string  `gorm:"column:pic" json:"pic"`
+	BloodFlowVolume           float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume"`
+	VenousPressure            float64 `gorm:"column:venous_pressure" json:"venous_pressure"`
+	VenousPressureType        int64   `gorm:"column:venous_pressure_type" json:"venous_pressure_type"`
+	ArterialPressure          float64 `gorm:"column:arterial_pressure" json:"arterial_pressure"`
+	ArterialPressureType      int64   `gorm:"column:arterial_pressure_type" json:"arterial_pressure_type"`
+	TransmembranePressure     float64 `gorm:"column:transmembrane_pressure" json:"transmembrane_pressure"`
+	TransmembranePressureType int64   `gorm:"column:transmembrane_pressure_type" json:"transmembrane_pressure_type"`
+	UltrafiltrationRate       float64 `gorm:"column:ultrafiltration_rate" json:"ultrafiltration_rate"`
+	UltrafiltrationVolume     float64 `gorm:"column:ultrafiltration_volume" json:"ultrafiltration_volume"`
+	SodiumConcentration       float64 `gorm:"column:sodium_concentration" json:"sodium_concentration"`
+	DialysateTemperature      float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature"`
+	Temperature               float64 `gorm:"column:temperature" json:"temperature"`
+	ReplacementRate           float64 `gorm:"column:replacement_rate" json:"replacement_rate"`
+	DisplacementQuantity      float64 `gorm:"column:displacement_quantity" json:"displacement_quantity"`
+	Ktv                       float64 `gorm:"column:ktv" json:"ktv"`
+	Symptom                   string  `gorm:"column:symptom" json:"symptom"`
+	Dispose                   string  `gorm:"column:dispose" json:"dispose"`
+	Result                    string  `gorm:"column:result" json:"result"`
+	MonitoringNurse           int64   `gorm:"column:monitoring_nurse" json:"monitoring_nurse"`
+	Status                    int64   `gorm:"column:status" json:"status"`
+	CreatedTime               int64   `gorm:"column:created_time" json:"created_time"`
+	UpdatedTime               int64   `gorm:"column:updated_time" json:"updated_time"`
+	Conductivity              float64 `gorm:"column:conductivity" json:"conductivity"`
+	DisplacementFlowQuantity  float64 `gorm:"column:displacement_flow_quantity" json:"displacement_flow_quantity"`
+	BloodOxygenSaturation     string  `gorm:"column:blood_oxygen_saturation" json:"blood_oxygen_saturation" form:"blood_oxygen_saturation"`
+	Creator                   int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                    int64   `gorm:"column:modify" json:"modify" form:"modify"`
+	Heparin                   float64 `gorm:"column:heparin" json:"heparin" form:"heparin"`
+	DialysateFlow             float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	Sort                      int64   `gorm:"column:sort" json:"sort"`
+}
+
+func (XTMonitoringRecord) TableName() string {
+	return "xt_monitoring_record"
+}
+
+type VmMonitoringRecord 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"`
+	MonitoringTime         string  `gorm:"column:monitoring_time" json:"monitoring_time"`
+	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
+	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
+}
+
+func (VmMonitoringRecord) TableName() string {
+	return "xt_monitoring_record"
+}
+
+type XtPatientsInspection struct {
+	ID           int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId    int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ItemId       int64  `gorm:"column:item_id" json:"item_id" form:"item_id"`
+	ItemName     string `gorm:"column:item_name" json:"item_name" form:"item_name"`
+	InspectType  int64  `gorm:"column:inspect_type" json:"inspect_type" form:"inspect_type"`
+	InspectValue string `gorm:"column:inspect_value" json:"inspect_value" form:"inspect_value"`
+	InspectDate  int64  `gorm:"column:inspect_date" json:"inspect_date" form:"inspect_date"`
+	Status       int64  `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime  int64  `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	Name         string `gorm:"column:name" json:"name" form:"name"`
+	MinRange     string `gorm:"column:min_range" json:"min_range" form:"min_range"`
+	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"`
+}

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
 }
@@ -408,7 +413,7 @@ func GetDialysisPatientList(startime int64, endtime int64, page int64, limit int
 
 func GetLastSort(orgid int64) (models.XtQualityControlStandard, error) {
 	standard := models.XtQualityControlStandard{}
-	err := XTReadDB().Model(&standard).Where("user_org_id = ? and status =1", orgid).Last(&standard).Error
+	err := XTReadDB().Model(&standard).Where("user_org_id = ? and status =1 and is_status = 1", orgid).Last(&standard).Error
 	return standard, err
 }
 
@@ -791,12 +796,12 @@ func GetNormDataByOrgId(orgid int64) (standard []*models.QualityControlStandard,
 
 	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)
 
-	err = db.Order("x.sort asc,x.created_time asc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name,x.range_value,x.range_type").
+	err = db.Order("x.sort asc,x.created_time asc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name,x.range_value,x.range_type,x.is_status").
 		Joins("left join xt_inspection_reference as s on (s.item_id = x.inspection_minor AND s.org_id > 0) OR (s.id = x.inspection_minor AND s.org_id = 0)").Scan(&standard).Error
 	return standard, err
 }
@@ -805,7 +810,7 @@ func GetNormData(orgid int64) (standard []*models.QualityControlStandard, err er
 
 	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)
@@ -851,16 +856,16 @@ func GetFirstQuarter(orgid int64, startime int64, endtime int64) (inspection []*
 }
 
 func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto int64) (inspection []*models.VmPatientInspectionTwo, err error) {
-
+	fmt.Println(lapseto)
 	db := XTReadDB().Table("xt_inspection as x ").Where("x.status = 1")
 	table := XTReadDB().Table("xt_inspection_reference as r")
 	fmt.Println(table)
-	d := XTReadDB().Table("xt_patients as s")
-	fmt.Println(d)
+	//d := XTReadDB().Table("xt_patients as s")
+	//fmt.Println(d)
 	q := XTReadDB().Table("x.xt_quality_control_standard as q")
 	fmt.Println(q)
 	if orgid > 0 {
-		db = db.Where("x.org_id = ? and x.inspect_value+0 <> 0 and r.range_type = 1 and q.user_org_id = ?", orgid, orgid)
+		db = db.Where("x.org_id = ? and x.inspect_value+0 <> 0 and r.range_type = 1 and q.user_org_id = ? and q.is_status = 1", orgid, orgid)
 	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)
@@ -868,27 +873,27 @@ func GetQuarterTotalCount(orgid int64, startime int64, endtime int64, lapseto in
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	if lapseto == 0 {
-		db = db.Where("s.lapseto = 1 or s.lapseto = 2")
-	}
-	if lapseto > 0 {
-		db = db.Where("s.lapseto = ?", lapseto)
-	}
-	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=q.min_range+0 and x.inspect_value +0 <= q.large_range+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_patients as  s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
+	//if lapseto == 0 {
+	//	db = db.Where("s.lapseto = 1 or s.lapseto = 2")
+	//}
+	//if lapseto > 0 {
+	//	db = db.Where("s.lapseto = ?", lapseto)
+	//}
+	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when x.inspect_value+0>=q.min_range+0 and x.inspect_value +0 <= q.large_range+0 and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
 
 func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto int64) (inspection []*models.VmPatientInspectionTwo, err error) {
-
+	fmt.Println(lapseto)
 	db := XTReadDB().Table("xt_inspection as x ").Where("x.status = 1")
 	table := XTReadDB().Table("xt_inspection_reference as r")
 	fmt.Println(table)
-	d := XTReadDB().Table("xt_patients as s")
-	fmt.Println(d)
+	//d := XTReadDB().Table("xt_patients as s")
+	//fmt.Println(d)
 	q := XTReadDB().Table("x.xt_quality_control_standard as q")
 	fmt.Println(q)
 	if orgid > 0 {
-		db = db.Where("x.org_id = ?  and r.range_type = 2 and q.user_org_id = ? and x.inspect_value <>''", orgid, orgid)
+		db = db.Where("x.org_id = ?  and r.range_type = 2 and q.user_org_id = ? and q.is_status = 1 and x.inspect_value <>''", orgid, orgid)
 	}
 	if startime > 0 {
 		db = db.Where("x.inspect_date >=?", startime)
@@ -896,13 +901,13 @@ func GetQuarterTotalCountTwo(orgid int64, startime int64, endtime int64, lapseto
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	if lapseto == 0 {
-		db = db.Where("s.lapseto = 1 or s.lapseto = 2")
-	}
-	if lapseto > 0 {
-		db = db.Where("s.lapseto = ?", lapseto)
-	}
-	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when q.range_value = x.inspect_value and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_patients as  s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
+	//if lapseto == 0 {
+	//	db = db.Where("s.lapseto = 1 or s.lapseto = 2")
+	//}
+	//if lapseto > 0 {
+	//	db = db.Where("s.lapseto = ?", lapseto)
+	//}
+	err = db.Group("x.item_id").Select("sum(case when x.inspect_date >=? and x.inspect_date<=? then 1 else 0 end) as total,sum(case when q.range_value = x.inspect_value and x.inspect_date >=? and x.inspect_date <=? then 1 else 0 end) as count,x.item_id,q.sort", startime, endtime, startime, endtime).Joins("left join xt_inspection_reference as r on ( r.item_id = x.item_id AND r.org_id > 0) OR ( x.item_id = r.id AND r.org_id = 0 ) ").Joins("left join xt_quality_control_standard as q on q.inspection_minor = x.item_id").Scan(&inspection).Error
 	return inspection, err
 }
 
@@ -2385,7 +2390,7 @@ func GetPatientsControl(orgid int64, lapstor int64, startime int64, endtime int6
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as r on x.item_id = r.inspection_minor ").Where("r.user_org_id = ? and r.status = 1", orgid).Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
+	err = db.Select("x.id,x.patient_id,s.name,s.dialysis_no,x.inspect_date").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_quality_control_standard as r on x.item_id = r.inspection_minor ").Where("r.user_org_id = ? and r.status = 1 and r.is_status = 1", orgid).Group("x.inspect_date").Count(&total).Offset(offset).Limit(limit).Scan(&inspection).Error
 
 	return inspection, total, err
 }
@@ -2450,7 +2455,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.min_range<>''and d.user_org_id = ?", orgid).Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.min_range<>''and d.user_org_id = ? and d.is_status =1", orgid).Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }
@@ -2468,7 +2473,7 @@ func GetTotalPatientsControl(orgid int64, startime int64, endtime int64) (inspec
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Select("x.id").Joins("RIGHT JOIN xt_quality_control_standard as s on x.project_id = s.inspection_major and x.item_id = s.inspection_minor and x.org_id = s.user_org_id ").Where("s.status = 1").Count(&total).Scan(&inspection).Error
+	err = db.Select("x.id").Joins("RIGHT JOIN xt_quality_control_standard as s on x.project_id = s.inspection_major and x.item_id = s.inspection_minor and x.org_id = s.user_org_id ").Where("s.status = 1 and s.is_status =1").Count(&total).Scan(&inspection).Error
 	return inspection, total, err
 }
 func GetStandControl(orgid int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, total int64, err error) {
@@ -2484,7 +2489,7 @@ func GetStandControl(orgid int64, startime int64, endtime int64) (inspection []*
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	db = db.Where("s.status = 1")
+	db = db.Where("s.status = 1 and s.is_status = 1")
 	err = db.Select("x.id").Joins("RIGHT JOIN xt_quality_control_standard as s on x.project_id = s.inspection_major and x.item_id = s.inspection_minor and x.org_id = s.user_org_id ").Where("x.inspect_value+0 >= s.min_range + 0 and x.inspect_value+0 <= s.large_range + 0 ").Count(&total).Scan(&inspection).Error
 	return inspection, total, err
 }
@@ -2502,7 +2507,7 @@ func GetStandControlOne(orgid int64, startime int64, endtime int64) (inspection
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	db = db.Where("s.status = 1")
+	db = db.Where("s.status = 1 and s.is_status = 1")
 	err = db.Select("x.id").Joins("RIGHT JOIN xt_quality_control_standard as s on x.project_id = s.inspection_major and x.item_id = s.inspection_minor and x.org_id = s.user_org_id ").Where("x.inspect_value = s.range_value").Count(&total).Scan(&inspection).Error
 	return inspection, total, err
 }
@@ -2566,7 +2571,7 @@ func GetInfectiousControl(orgid int64, lapstor int64, startime int64, endtime in
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.range_value <>''and d.user_org_id = ?", orgid).Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.range_value <>''and d.user_org_id = ? and d.is_status = 1", orgid).Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }
@@ -2704,3 +2709,507 @@ 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
+
+}
+
+func GetSystolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, 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
+	return record, total, err
+}
+
+func GetStandSystolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	err = db.Select("x.id,s.sort").Joins("left join xt_quality_control_standard as s on s.user_org_id = x.user_org_id").Where("s.status = 1 and s.is_status = 0 and s.user_org_id = ? and x.user_org_id =? and x.monitoring_date>=? and x.monitoring_date <=? and s.inspection_minor = -1 and s.inspection_major = 0 and x.systolic_blood_pressure <> 0 and x.systolic_blood_pressure +0 >= s.min_range +0 and x.systolic_blood_pressure +0 <= s.large_range +0", orgid, orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	return record, total, err
+}
+
+func GetDiastolicBloodPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, 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
+	return record, total, err
+}
+
+func GetDiastolicStandPressure(orgid int64, startime int64, endtime int64) (record []*models.XTMonitoringRecord, total int64, err error) {
+	db := XTReadDB().Table("xt_monitoring_record as x").Where("x.status = 1")
+	err = db.Select("x.id,s.sort").Joins("left join xt_quality_control_standard as s on s.user_org_id = x.user_org_id").Where("s.status = 1 and s.is_status = 0 and s.user_org_id = ? and x.user_org_id =? and x.monitoring_date>=? and x.monitoring_date <=? and s.inspection_minor = -2 and s.inspection_major = 0 and x.diastolic_blood_pressure <> 0 and x.diastolic_blood_pressure +0 >= s.min_range +0 and x.diastolic_blood_pressure +0 <= s.large_range +0", orgid, orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Count(&total).Scan(&record).Error
+	return record, total, err
+}
+
+func GetQuarterTargeStand(orgid int64, firststart int64, firstend int64, sencondstart int64, sencondend int64, threestart int64, threeend int64, fourstart int64, fourend int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '4'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value+0<>0 and x.status = 1  and x.inspect_type = 1 and s.is_status = 1 and s.status = 1 and x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, firststart)
+	countParams = append(countParams, firstend)
+	countParams = append(countParams, sencondstart)
+	countParams = append(countParams, sencondend)
+	countParams = append(countParams, threestart)
+	countParams = append(countParams, threeend)
+	countParams = append(countParams, fourstart)
+	countParams = append(countParams, fourend)
+	if orgid > 0 {
+		db = db.Where("x.org_id=?", orgid)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgid)
+
+		db = db.Where("x.inspect_date>=?", firststart)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, firststart)
+
+		db = db.Where("x.inspect_date<=?", fourend)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, fourend)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetQuarterTargeNoStand(orgid int64, firststart int64, firstend int64, sencondstart int64, sencondend int64, threestart int64, threeend int64, fourstart int64, fourend int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '4'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value+0<>0 and x.status = 1  and x.inspect_type = 1 and s.is_status = 1 and s.status = 1 and (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0)"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, firststart)
+	countParams = append(countParams, firstend)
+	countParams = append(countParams, sencondstart)
+	countParams = append(countParams, sencondend)
+	countParams = append(countParams, threestart)
+	countParams = append(countParams, threeend)
+	countParams = append(countParams, fourstart)
+	countParams = append(countParams, fourend)
+	if orgid > 0 {
+		db = db.Where("x.org_id=?", orgid)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgid)
+
+		db = db.Where("x.inspect_date>=?", firststart)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, firststart)
+
+		db = db.Where("x.inspect_date<=?", fourend)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, fourend)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetContagionQuarterTargeStand(orgid int64, firststart int64, firstend int64, sencondstart int64, sencondend int64, threestart int64, threeend int64, fourstart int64, fourend int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value = s.range_value  THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value = s.range_value THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value = s.range_value THEN '4'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value<>'' and x.status = 1  and x.inspect_type = 2 and s.is_status = 1 and s.status = 1 and  x.inspect_value = s.range_value"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, firststart)
+	countParams = append(countParams, firstend)
+	countParams = append(countParams, sencondstart)
+	countParams = append(countParams, sencondend)
+	countParams = append(countParams, threestart)
+	countParams = append(countParams, threeend)
+	countParams = append(countParams, fourstart)
+	countParams = append(countParams, fourend)
+	if orgid > 0 {
+		db = db.Where("x.org_id=?", orgid)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgid)
+
+		db = db.Where("x.inspect_date>=?", firststart)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, firststart)
+
+		db = db.Where("x.inspect_date<=?", fourend)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, fourend)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetContagionTargeNoStand(orgid int64, firststart int64, firstend int64, sencondstart int64, sencondend int64, threestart int64, threeend int64, fourstart int64, fourend int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value <> s.range_value  THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value <> s.range_value THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value <> s.range_value THEN '4'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value<>'' and x.status = 1  and x.inspect_type = 2 and s.is_status = 1 and s.status = 1 and  x.inspect_value <> s.range_value"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, firststart)
+	countParams = append(countParams, firstend)
+	countParams = append(countParams, sencondstart)
+	countParams = append(countParams, sencondend)
+	countParams = append(countParams, threestart)
+	countParams = append(countParams, threeend)
+	countParams = append(countParams, fourstart)
+	countParams = append(countParams, fourend)
+	if orgid > 0 {
+		db = db.Where("x.org_id=?", orgid)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgid)
+
+		db = db.Where("x.inspect_date>=?", firststart)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, firststart)
+
+		db = db.Where("x.inspect_date<=?", fourend)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, fourend)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetMonthTargetStand(orgId, januaryStartStrUnix int64, januaryEndStrUnix int64, febStartStrStrUnix int64, febEndStrUnix int64, marchStartStrUnix int64, marchEndStrUnix int64, aprStartStrUnix int64, aprEndStrsUnix int64, mayStartStrUnix int64, mayEndStrsUnix int64, junStartStrUnix int64, junEndStrsUnix int64, julStartStrUnix int64, julEndStrsUnix int64, augStartStrUnix int64, augEndStrsUnix int64, sepStartStrUnix int64, sepEndStrsUnix int64, octStartStrUnix int64, octEndStrsUnix int64, novStartStrUnix int64, novEndStrsUnix int64, decStartStrUnix int64, decEndStrsUnix int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '4'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '5'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '6'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '7'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '8'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '9'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '10'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '11'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0 THEN '12'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value+0<>0 and x.status = 1  and x.inspect_type = 1 and s.is_status = 1 and s.status = 1 and x.inspect_value + 0 >= s.min_range + 0 AND x.inspect_value + 0 <= s.large_range + 0"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, januaryStartStrUnix)
+	countParams = append(countParams, januaryEndStrUnix)
+	countParams = append(countParams, febStartStrStrUnix)
+	countParams = append(countParams, febEndStrUnix)
+	countParams = append(countParams, marchStartStrUnix)
+	countParams = append(countParams, marchEndStrUnix)
+	countParams = append(countParams, aprStartStrUnix)
+	countParams = append(countParams, aprEndStrsUnix)
+	countParams = append(countParams, mayStartStrUnix)
+	countParams = append(countParams, mayEndStrsUnix)
+	countParams = append(countParams, junStartStrUnix)
+	countParams = append(countParams, junEndStrsUnix)
+	countParams = append(countParams, julStartStrUnix)
+	countParams = append(countParams, julEndStrsUnix)
+	countParams = append(countParams, augStartStrUnix)
+	countParams = append(countParams, augEndStrsUnix)
+	countParams = append(countParams, sepStartStrUnix)
+	countParams = append(countParams, sepEndStrsUnix)
+	countParams = append(countParams, octStartStrUnix)
+	countParams = append(countParams, octEndStrsUnix)
+	countParams = append(countParams, novStartStrUnix)
+	countParams = append(countParams, novEndStrsUnix)
+	countParams = append(countParams, decStartStrUnix)
+	countParams = append(countParams, decEndStrsUnix)
+	if orgId > 0 {
+		db = db.Where("x.org_id=?", orgId)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgId)
+
+		db = db.Where("x.inspect_date>=?", januaryStartStrUnix)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, januaryStartStrUnix)
+
+		db = db.Where("x.inspect_date<=?", decStartStrUnix)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, decEndStrsUnix)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetMonthTargetNoStand(orgId, januaryStartStrUnix int64, januaryEndStrUnix int64, febStartStrStrUnix int64, febEndStrUnix int64, marchStartStrUnix int64, marchEndStrUnix int64, aprStartStrUnix int64, aprEndStrsUnix int64, mayStartStrUnix int64, mayEndStrsUnix int64, junStartStrUnix int64, junEndStrsUnix int64, julStartStrUnix int64, julEndStrsUnix int64, augStartStrUnix int64, augEndStrsUnix int64, sepStartStrUnix int64, sepEndStrsUnix int64, octStartStrUnix int64, octEndStrsUnix int64, novStartStrUnix int64, novEndStrsUnix int64, decStartStrUnix int64, decEndStrsUnix int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '4'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '5'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '6'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '7'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '8'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '9'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '10'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '11'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0) THEN '12'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value+0<>0 and x.status = 1  and x.inspect_type = 1 and s.is_status = 1 and s.status = 1 and  (x.inspect_value + 0 < s.min_range + 0 or x.inspect_value + 0 > s.large_range + 0)"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, januaryStartStrUnix)
+	countParams = append(countParams, januaryEndStrUnix)
+	countParams = append(countParams, febStartStrStrUnix)
+	countParams = append(countParams, febEndStrUnix)
+	countParams = append(countParams, marchStartStrUnix)
+	countParams = append(countParams, marchEndStrUnix)
+	countParams = append(countParams, aprStartStrUnix)
+	countParams = append(countParams, aprEndStrsUnix)
+	countParams = append(countParams, mayStartStrUnix)
+	countParams = append(countParams, mayEndStrsUnix)
+	countParams = append(countParams, junStartStrUnix)
+	countParams = append(countParams, junEndStrsUnix)
+	countParams = append(countParams, julStartStrUnix)
+	countParams = append(countParams, julEndStrsUnix)
+	countParams = append(countParams, augStartStrUnix)
+	countParams = append(countParams, augEndStrsUnix)
+	countParams = append(countParams, sepStartStrUnix)
+	countParams = append(countParams, sepEndStrsUnix)
+	countParams = append(countParams, octStartStrUnix)
+	countParams = append(countParams, octEndStrsUnix)
+	countParams = append(countParams, novStartStrUnix)
+	countParams = append(countParams, novEndStrsUnix)
+	countParams = append(countParams, decStartStrUnix)
+	countParams = append(countParams, decEndStrsUnix)
+	if orgId > 0 {
+		db = db.Where("x.org_id=?", orgId)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgId)
+
+		db = db.Where("x.inspect_date>=?", januaryStartStrUnix)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, januaryStartStrUnix)
+
+		db = db.Where("x.inspect_date<=?", decStartStrUnix)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, decEndStrsUnix)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetMonthcontagionTargeStand(orgId, januaryStartStrUnix int64, januaryEndStrUnix int64, febStartStrStrUnix int64, febEndStrUnix int64, marchStartStrUnix int64, marchEndStrUnix int64, aprStartStrUnix int64, aprEndStrsUnix int64, mayStartStrUnix int64, mayEndStrsUnix int64, junStartStrUnix int64, junEndStrsUnix int64, julStartStrUnix int64, julEndStrsUnix int64, augStartStrUnix int64, augEndStrsUnix int64, sepStartStrUnix int64, sepEndStrsUnix int64, octStartStrUnix int64, octEndStrsUnix int64, novStartStrUnix int64, novEndStrsUnix int64, decStartStrUnix int64, decEndStrsUnix int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '4'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '5'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '6'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '7'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '8'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '9'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '10'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '11'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value = s.range_value THEN '12'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value<>'' and x.status = 1  and x.inspect_type = 2 and s.is_status = 1 and s.status = 1 and  x.inspect_value = s.range_value"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, januaryStartStrUnix)
+	countParams = append(countParams, januaryEndStrUnix)
+	countParams = append(countParams, febStartStrStrUnix)
+	countParams = append(countParams, febEndStrUnix)
+	countParams = append(countParams, marchStartStrUnix)
+	countParams = append(countParams, marchEndStrUnix)
+	countParams = append(countParams, aprStartStrUnix)
+	countParams = append(countParams, aprEndStrsUnix)
+	countParams = append(countParams, mayStartStrUnix)
+	countParams = append(countParams, mayEndStrsUnix)
+	countParams = append(countParams, junStartStrUnix)
+	countParams = append(countParams, junEndStrsUnix)
+	countParams = append(countParams, julStartStrUnix)
+	countParams = append(countParams, julEndStrsUnix)
+	countParams = append(countParams, augStartStrUnix)
+	countParams = append(countParams, augEndStrsUnix)
+	countParams = append(countParams, sepStartStrUnix)
+	countParams = append(countParams, sepEndStrsUnix)
+	countParams = append(countParams, octStartStrUnix)
+	countParams = append(countParams, octEndStrsUnix)
+	countParams = append(countParams, novStartStrUnix)
+	countParams = append(countParams, novEndStrsUnix)
+	countParams = append(countParams, decStartStrUnix)
+	countParams = append(countParams, decEndStrsUnix)
+	if orgId > 0 {
+		db = db.Where("x.org_id=?", orgId)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgId)
+
+		db = db.Where("x.inspect_date>=?", januaryStartStrUnix)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, januaryStartStrUnix)
+
+		db = db.Where("x.inspect_date<=?", decStartStrUnix)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, decEndStrsUnix)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetMonthcontagionTargeNoStand(orgId, januaryStartStrUnix int64, januaryEndStrUnix int64, febStartStrStrUnix int64, febEndStrUnix int64, marchStartStrUnix int64, marchEndStrUnix int64, aprStartStrUnix int64, aprEndStrsUnix int64, mayStartStrUnix int64, mayEndStrsUnix int64, junStartStrUnix int64, junEndStrsUnix int64, julStartStrUnix int64, julEndStrsUnix int64, augStartStrUnix int64, augEndStrsUnix int64, sepStartStrUnix int64, sepEndStrsUnix int64, octStartStrUnix int64, octEndStrsUnix int64, novStartStrUnix int64, novEndStrsUnix int64, decStartStrUnix int64, decEndStrsUnix int64) (inspection []*models.ProjectCountTwo, err error) {
+
+	db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+	countSQL := "SELECT nnd AS 'name',COUNT(*) AS 'count' FROM(" +
+		"SELECT " +
+		"CASE " +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '1'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '2'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '3'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '4'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '5'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '6'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '7'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '8'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '9'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '10'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '11'" +
+		" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND  x.inspect_value <> s.range_value THEN '12'" +
+		" ELSE '其他'" +
+		"END AS nnd FROM xt_inspection as x right join xt_quality_control_standard AS s ON x.project_id = s.inspection_major AND x.item_id = s.inspection_minor AND x.org_id = s.user_org_id where x.inspect_value<>'' and x.status = 1  and x.inspect_type = 2 and s.is_status = 1 and s.status = 1 and  x.inspect_value <> s.range_value"
+	countParams := make([]interface{}, 0)
+	countParams = append(countParams, januaryStartStrUnix)
+	countParams = append(countParams, januaryEndStrUnix)
+	countParams = append(countParams, febStartStrStrUnix)
+	countParams = append(countParams, febEndStrUnix)
+	countParams = append(countParams, marchStartStrUnix)
+	countParams = append(countParams, marchEndStrUnix)
+	countParams = append(countParams, aprStartStrUnix)
+	countParams = append(countParams, aprEndStrsUnix)
+	countParams = append(countParams, mayStartStrUnix)
+	countParams = append(countParams, mayEndStrsUnix)
+	countParams = append(countParams, junStartStrUnix)
+	countParams = append(countParams, junEndStrsUnix)
+	countParams = append(countParams, julStartStrUnix)
+	countParams = append(countParams, julEndStrsUnix)
+	countParams = append(countParams, augStartStrUnix)
+	countParams = append(countParams, augEndStrsUnix)
+	countParams = append(countParams, sepStartStrUnix)
+	countParams = append(countParams, sepEndStrsUnix)
+	countParams = append(countParams, octStartStrUnix)
+	countParams = append(countParams, octEndStrsUnix)
+	countParams = append(countParams, novStartStrUnix)
+	countParams = append(countParams, novEndStrsUnix)
+	countParams = append(countParams, decStartStrUnix)
+	countParams = append(countParams, decEndStrsUnix)
+	if orgId > 0 {
+		db = db.Where("x.org_id=?", orgId)
+		countSQL += " AND x.org_id=?"
+		countParams = append(countParams, orgId)
+
+		db = db.Where("x.inspect_date>=?", januaryStartStrUnix)
+		countSQL += " AND x.inspect_date>=?"
+		countParams = append(countParams, januaryStartStrUnix)
+
+		db = db.Where("x.inspect_date<=?", decStartStrUnix)
+		countSQL += " AND x.inspect_date<=?"
+		countParams = append(countParams, decEndStrsUnix)
+
+	}
+	countSQL += ")a GROUP BY nnd"
+	err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	return
+}
+
+func GetQuarterBloodList(orgid int64, januaryStartStrUnix int64, januaryEndStrUnix int64) (record []*models.VmMonitoringRecord, err error) {
+
+	db := XTReadDB().Table("xt_monitoring_record as x")
+	err = db.Select("x.id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.monitoring_date,x.patient_id,x.user_org_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, januaryStartStrUnix, januaryEndStrUnix).Group("x.monitoring_date,x.patient_id").Scan(&record).Error
+	return record, err
+}
+
+func GetTaregetNoStandDetail(orgid int64, startime int64, endtime int64) (inspection []*models.XtPatientsInspection, err error) {
+
+	db := XTReadDB().Table("xt_inspection as x")
+	err = db.Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,d.sort,d.min_range,d.large_range,d.range_value,d.range_type,x.inspect_type,x.org_id").Joins("left join xt_patients AS s ON s.id = x.patient_id").Joins("RIGHT JOIN xt_quality_control_standard AS d ON d.inspection_minor = x.item_id AND d.inspection_major = x.project_id AND x.org_id = d.user_org_id").Where("x.status = 1	and x.inspect_type = 1 and x.org_id = ? and x.inspect_value + 0 <> 0 and x.inspect_date >=? and x.inspect_date<=? and d.user_org_id = ? and d.is_status=1 and d.status = 1 and (x.inspect_value+0 < d.min_range+0  or x.inspect_value+0 > d.large_range + 0)", orgid, startime, endtime, orgid).Group("x.id").Order("x.inspect_date DESC").Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetConfigurationNoStandDetail(orgid int64, startime int64, endtime int64) (inspection []*models.XtPatientsInspection, err error) {
+	db := XTReadDB().Table("xt_inspection as x")
+	err = db.Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,d.sort,d.min_range,d.large_range,d.range_value,d.range_type,x.inspect_type,x.org_id").Joins("left join xt_patients AS s ON s.id = x.patient_id").Joins("RIGHT JOIN xt_quality_control_standard AS d ON d.inspection_minor = x.item_id AND d.inspection_major = x.project_id AND x.org_id = d.user_org_id").Where("x.status = 1	and x.inspect_type = 2 and x.org_id = ? and x.inspect_value  <> '' and x.inspect_date >=? and x.inspect_date<=? and d.user_org_id = ? and d.is_status=1 and d.status = 1 and (x.inspect_value <> d.range_value)", orgid, startime, endtime, orgid).Group("x.id").Order("x.inspect_date DESC").Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetInspectNoStandList(orgid int64, startime int64, endtime int64, limit int64, page int64) (inspection []*models.XtPatientsInspection, err error) {
+
+	db := XTReadDB().Table("xt_inspection as x")
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,d.sort,d.min_range,d.large_range,d.range_value,d.range_type,x.inspect_type,x.org_id").Joins("left join xt_patients AS s ON s.id = x.patient_id").Joins("RIGHT JOIN xt_quality_control_standard AS d ON d.inspection_minor = x.item_id AND d.inspection_major = x.project_id AND x.org_id = d.user_org_id").Where("x.status = 1	and x.inspect_type = 1 and x.org_id = ? and x.inspect_value + 0 <> 0 and x.inspect_date >=? and x.inspect_date<=? and d.user_org_id = ? and d.is_status=1 and d.status = 1 and (x.inspect_value+0 < d.min_range+0  or x.inspect_value+0 > d.large_range + 0)", orgid, startime, endtime, orgid).Group("x.id").Offset(offset).Limit(limit).Order("x.inspect_date DESC").Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetTargetStandDetail(orgid int64, startime int64, endtime int64) (inspection []*models.XtPatientsInspection, err error) {
+	db := XTReadDB().Table("xt_inspection as x")
+	err = db.Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,d.sort,d.min_range,d.large_range,d.range_value,d.range_type,x.inspect_type,x.org_id").Joins("left join xt_patients AS s ON s.id = x.patient_id").Joins("RIGHT JOIN xt_quality_control_standard AS d ON d.inspection_minor = x.item_id AND d.inspection_major = x.project_id AND x.org_id = d.user_org_id").Where("x.status = 1	and x.inspect_type = 1 and x.org_id = ? and x.inspect_value + 0 <> 0 and x.inspect_date >=? and x.inspect_date<=? and d.user_org_id = ? and d.is_status=1 and d.status = 1 and x.inspect_value+0 >=d.min_range+0  and x.inspect_value+0 <= d.large_range + 0", orgid, startime, endtime, orgid).Group("x.id").Order("x.inspect_date DESC").Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetConfigurationStandDetail(orgid int64, startime int64, endtime int64) (inspection []*models.XtPatientsInspection, err error) {
+	db := XTReadDB().Table("xt_inspection as x")
+	err = db.Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,d.sort,d.min_range,d.large_range,d.range_value,d.range_type,x.inspect_type,x.org_id").Joins("left join xt_patients AS s ON s.id = x.patient_id").Joins("RIGHT JOIN xt_quality_control_standard AS d ON d.inspection_minor = x.item_id AND d.inspection_major = x.project_id AND x.org_id = d.user_org_id").Where("x.status = 1	and x.inspect_type = 2 and x.org_id = ? and x.inspect_value  <> '' and x.inspect_date >=? and x.inspect_date<=? and d.user_org_id = ? and d.is_status=1 and d.status = 1 and (x.inspect_value = d.range_value)", orgid, startime, endtime, orgid).Group("x.id").Order("x.inspect_date DESC").Scan(&inspection).Error
+	return inspection, err
+}
+
+func GetStandList(orgid int64, startime int64, endtime int64, limit int64, page int64) (inspection []*models.XtPatientsInspection, err error) {
+	db := XTReadDB().Table("xt_inspection as x")
+	offset := (page - 1) * limit
+	err = db.Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,d.sort,d.min_range,d.large_range,d.range_value,d.range_type,x.inspect_type,x.org_id").Joins("left join xt_patients AS s ON s.id = x.patient_id").Joins("RIGHT JOIN xt_quality_control_standard AS d ON d.inspection_minor = x.item_id AND d.inspection_major = x.project_id AND x.org_id = d.user_org_id").Where("x.status = 1	and x.inspect_type = 1 and x.org_id = ? and x.inspect_value + 0 <> 0 and x.inspect_date >=? and x.inspect_date<=? and d.user_org_id = ? and d.is_status=1 and d.status = 1 and x.inspect_value+0 >=d.min_range+0  and x.inspect_value+0 <= d.large_range + 0", orgid, startime, endtime, orgid).Group("x.id").Offset(offset).Limit(limit).Order("x.inspect_date DESC").Scan(&inspection).Error
+
+	return inspection, 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
 }
 

service/patientmanage_service.go

@@ -913,9 +913,9 @@ func GetDoctorAdviceDetail(state int64, id int64, orgid int64) (advices []*model
 	return advices, err
 }
 
-func DeleteManagement(groupid int64, orgid int64) error {
+func DeleteManagement(groupid int64, orgid int64, patientid int64) error {
 
-	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("start_time =? and user_org_id = ?", groupid, orgid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
+	err := XTWriteDB().Model(models.DoctorAdvice{}).Where("start_time =? and user_org_id = ? and patient_id =?", groupid, orgid, patientid).Update(map[string]interface{}{"status": 0, "updated_time": time.Now().Unix()}).Error
 	return err
 }