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

controllers/base_api_controller.go

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

controllers/mobile_api_controllers/login_api_controller.go

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

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -21,7 +21,6 @@ func (this *CommonApiController) GetInspectionMajor() {
 	adminInfo := this.GetAdminUserInfo()
 	orgid := adminInfo.CurrentOrgId
 	major, err := service.GetInspectionMajor(orgid)
-
 	if len(major) == 0 {
 		major, _ := service.GetInspectionMajor(0)
 		if err != nil {
@@ -106,32 +105,67 @@ func (this *CommonApiController) SaveConfiguration() {
 	if rangvalue == "0" {
 		rangvalue = ""
 	}
-	_, errcode := service.GetConfigurationById(inspectionmajor, inspectionMinor, orgid)
-	if errcode == gorm.ErrRecordNotFound {
-		standard := models.XtQualityControlStandard{
-			InspectionMajor: inspectionmajor,
-			InspectionMinor: inspectionMinor,
-			MinRange:        minrange,
-			LargeRange:      largerange,
-			Sort:            sorts,
-			UserOrgId:       orgid,
-			Status:          1,
-			RangeType:       checktype,
-			RangeValue:      rangvalue,
-			CreatedTime:     time.Now().Unix(),
+	// 参与集成的机构根据小项id获取item_id
+	itemid, err := service.GetItemid(inspectionMinor)
+	//查询小项是否有值
+	fmt.Println("小项id", itemid.ItemId)
+	major, err := service.GetInspectionMajor(orgid)
+	if len(major) == 0 {
+		_, errcode := service.GetConfigurationById(inspectionmajor, inspectionMinor, orgid)
+		if errcode == gorm.ErrRecordNotFound {
+			standard := models.XtQualityControlStandard{
+				InspectionMajor: inspectionmajor,
+				InspectionMinor: inspectionMinor,
+				MinRange:        minrange,
+				LargeRange:      largerange,
+				Sort:            sorts,
+				UserOrgId:       orgid,
+				Status:          1,
+				RangeType:       checktype,
+				RangeValue:      rangvalue,
+				CreatedTime:     time.Now().Unix(),
+			}
+			fmt.Println(standard)
+			err = service.SaveInspection(&standard)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"standard": standard,
+			})
+		} else if errcode == nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
 		}
-		fmt.Println(standard)
-		err = service.SaveInspection(&standard)
-		if err != nil {
-			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	} else {
+		_, errcode := service.GetConfigurationById(inspectionmajor, inspectionMinor, orgid)
+		if errcode == gorm.ErrRecordNotFound {
+			standard := models.XtQualityControlStandard{
+				InspectionMajor: inspectionmajor,
+				InspectionMinor: itemid.ItemId,
+				MinRange:        minrange,
+				LargeRange:      largerange,
+				Sort:            sorts,
+				UserOrgId:       orgid,
+				Status:          1,
+				RangeType:       checktype,
+				RangeValue:      rangvalue,
+				CreatedTime:     time.Now().Unix(),
+			}
+			fmt.Println(standard)
+			err = service.SaveInspection(&standard)
+			if err != nil {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+				return
+			}
+			this.ServeSuccessJSON(map[string]interface{}{
+				"standard": standard,
+			})
+		} else if errcode == nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-		this.ServeSuccessJSON(map[string]interface{}{
-			"standard": standard,
-		})
-	} else if errcode == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
 	}
 
 }
@@ -141,40 +175,87 @@ func (this *CommonApiController) GetConfigurationlist() {
 	page, _ := this.GetInt64("page")
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	configurationlist, total, err := service.GetConfigurationlist(orgid, limit, page)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	major, _ := service.GetInspectionMajor(orgid)
+	if len(major) == 0 {
+		configurationlist, total, err := service.GetConfigurationlist(orgid, limit, page)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"configurationlist": configurationlist,
+			"total":             total,
+		})
+	} else {
+		configurationlist, total, err := service.GetConfigurationListTwo(orgid, limit, page)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"configurationlist": configurationlist,
+			"total":             total,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"configurationlist": configurationlist,
-		"total":             total,
-	})
+
 }
 
 func (this *CommonApiController) GetConfigurationDetail() {
 	id, _ := this.GetInt64("id")
 	//fmt.Println("id是", id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
 	detail, err := service.GetConfigurationDetail(id)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	major, err := service.GetInspectionMajor(orgId)
+	var vid = 0
+	if len(major) == 0 {
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"configurationdetail": detail,
+			"vid":                 vid,
+		})
+	} else {
+		itemId, err := service.GetIdByItemId(detail.InspectionMinor, orgId)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"configurationdetail": detail,
+			"vid":                 itemId.ID,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"configurationdetail": detail,
-	})
+
 }
 
 func (this *CommonApiController) GetAllInspectionminor() {
 
-	minor, err := service.GetAllInspectionMinor(0)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	info := this.GetAdminUserInfo()
+	orgid := info.CurrentOrgId
+	major, _ := service.GetInspectionMajor(orgid)
+
+	if len(major) == 0 {
+		minor, err := service.GetAllInspectionMinor(0)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"minor": minor,
+		})
+	} else {
+		minor, err := service.GetAllInspectionMinor(orgid)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"minor": minor,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"minor": minor,
-	})
+
 }
 
 func (this *CommonApiController) UpdateConfiguration() {
@@ -207,27 +288,54 @@ func (this *CommonApiController) UpdateConfiguration() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
-	standard := models.XtQualityControlStandard{
-		InspectionMajor: inspectionmajor,
-		InspectionMinor: inspectionMinor,
-		MinRange:        minrange,
-		LargeRange:      largerange,
-		Sort:            sort,
-		RangeValue:      rangvalue,
-		RangeType:       rangtype,
-		Status:          1,
-		UserOrgId:       orgId,
-		CreatedTime:     time.Now().Unix(),
-		UpdatedTime:     time.Now().Unix(),
-	}
-	err = service.UpdarteConfiguration(&standard, id)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+
+	major, err := service.GetInspectionMajor(orgId)
+	if len(major) == 0 {
+		standard := models.XtQualityControlStandard{
+			InspectionMajor: inspectionmajor,
+			InspectionMinor: inspectionMinor,
+			MinRange:        minrange,
+			LargeRange:      largerange,
+			Sort:            sort,
+			RangeValue:      rangvalue,
+			RangeType:       rangtype,
+			Status:          1,
+			UserOrgId:       orgId,
+			CreatedTime:     time.Now().Unix(),
+			UpdatedTime:     time.Now().Unix(),
+		}
+		err = service.UpdarteConfiguration(&standard, id)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"standard": standard,
+		})
+	} else {
+		itemid, _ := service.GetItemid(inspectionMinor)
+		standard := models.XtQualityControlStandard{
+			InspectionMajor: inspectionmajor,
+			InspectionMinor: itemid.ItemId,
+			MinRange:        minrange,
+			LargeRange:      largerange,
+			Sort:            sort,
+			RangeValue:      rangvalue,
+			RangeType:       rangtype,
+			Status:          1,
+			UserOrgId:       orgId,
+			CreatedTime:     time.Now().Unix(),
+			UpdatedTime:     time.Now().Unix(),
+		}
+		err = service.UpdarteConfiguration(&standard, id)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"standard": standard,
+		})
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"standard": standard,
-	})
 
 }
 
@@ -1283,9 +1391,9 @@ func (this *CommonApiController) GetPatientscontrol() {
 	limit, _ := this.GetInt64("limit")
 	fmt.Println("limit", limit)
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
-	//统计非传染病类型
+
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
-	//统计传染病类型
+
 	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 
 	if err != nil {
@@ -1318,20 +1426,29 @@ func (this *CommonApiController) GetCartogramList() {
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
 	endtimeStrsUnix := endtimeStrs.Unix()
 	fmt.Println("结束时间搓", endtimeStrsUnix)
-	limit, _ := this.GetInt64("limit")
-	page, _ := this.GetInt64("page")
-	cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
-	infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
-	_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+	//limit, _ := this.GetInt64("limit")
+	//page, _ := this.GetInt64("page")
+
+	//统计总共
+	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	fmt.Println("total=================", total)
+	//统计rangetype= 1
+	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	fmt.Println(standtotal)
+	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
+	fmt.Println(standtotalOne)
+	//cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	//infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	//_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"cartogramlist":     cartogramlist,
-		"total":             total,
-		"infectiouscontrol": infectiouscontrol,
+		"total":         total,
+		"standtotal":    standtotal,
+		"standtotalOne": standtotalOne,
 	})
 }
 

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -859,20 +859,28 @@ func (this *NewCommonApiController) GetMobileCartogramlist() {
 	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
 	endtimeStrsUnix := endtimeStrs.Unix()
 	fmt.Println("结束时间搓", endtimeStrsUnix)
-	limit, _ := this.GetInt64("limit")
-	page, _ := this.GetInt64("page")
-	cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
-	_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
-	infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	//统计总共
+	_, total, err := service.GetTotalPatientsControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	fmt.Println("total=================", total)
+	//统计rangetype= 1
+	_, standtotal, err := service.GetStandControl(orgid, startimeStrUnix, endtimeStrsUnix)
+	fmt.Println(standtotal)
+	_, standtotalOne, err := service.GetStandControlOne(orgid, startimeStrUnix, endtimeStrsUnix)
+	fmt.Println(standtotalOne)
+	//limit, _ := this.GetInt64("limit")
+	//page, _ := this.GetInt64("page")
+	//cartogramlist, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
+	//_, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+	//infectiouscontrol, err := service.GetInfectiousPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"cartogramlist":     cartogramlist,
-		"total":             total,
-		"infectiouscontrol": infectiouscontrol,
+		"total":         total,
+		"standtotal":    standtotal,
+		"standtotalOne": standtotalOne,
 	})
 }
 

service/common_service.go

@@ -26,6 +26,12 @@ func GetInspectionRange(id int64) (models.XtInspectionReference, error) {
 	return reference, err
 }
 
+func GetItemid(id int64) (models.XtInspectionReference, error) {
+	reference := models.XtInspectionReference{}
+	err = XTReadDB().Model(&reference).Where("id = ? and status = 1", id).Find(&reference).Error
+	return reference, err
+}
+
 func GetConfigurationById(major int64, moni int64, orgid int64) (*models.XtQualityControlStandard, error) {
 	standard := models.XtQualityControlStandard{}
 	err := XTReadDB().Model(&standard).Where("inspection_major = ? and inspection_minor = ? and user_org_id = ? and status = 1", major, moni, orgid).Find(&standard).Error
@@ -64,12 +70,31 @@ func GetConfigurationlist(orgid int64, limit int64, page int64) (standard []*mod
 	return standard, total, 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)
+	}
+	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).
+		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor").Offset(offset).Limit(limit).Scan(&standard).Error
+	return standard, total, err
+}
+
 func GetConfigurationDetail(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 GetIdByItemId(itemid int64, orgid int64) (models.XtInspectionReference, error) {
+	reference := models.XtInspectionReference{}
+	err := XTReadDB().Model(&reference).Where("item_id = ? and org_id = ?", itemid, orgid).Find(&reference).Error
+	return reference, err
+}
+
 func GetAllInspectionMinor(orgid int64) (standard []*models.XtInspectionReference, err error) {
 
 	err = XTReadDB().Model(&standard).Where("org_id = ? and status = 1", orgid).Find(&standard).Error
@@ -1854,26 +1879,26 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 	if lapseto == 0 {
 		d := XTReadDB().Table("xt_patients as s")
 		fmt.Println("d", d)
-		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 2")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 1")
 		table := XTReadDB().Table("xt_quality_control_standard as r")
 		fmt.Println(table)
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value <> r.range_value)"
+			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0 )"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -1904,6 +1929,11 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 			countSQL += " AND x.org_id=?"
 			countParams = append(countParams, orgid)
 		}
+		if orgid > 0 {
+			db = db.Where("r.user_org_id=?", orgid)
+			countSQL += " AND r.user_org_id=?"
+			countParams = append(countParams, orgid)
+		}
 		if modetype > 0 {
 			db = db.Where("x.item_id = ?", modetype)
 			countSQL += " AND x.item_id=?"
@@ -1927,26 +1957,26 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 
 		d := XTReadDB().Table("xt_patients as s")
 		fmt.Println("d", d)
-		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 2")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 1")
 		table := XTReadDB().Table("xt_quality_control_standard as r")
 		fmt.Println(table)
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1) and (x.inspect_value <> r.range_value)"
+			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1) and (x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0 )"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -1977,6 +2007,11 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 			countSQL += " AND x.org_id=?"
 			countParams = append(countParams, orgid)
 		}
+		if orgid > 0 {
+			db = db.Where("r.user_org_id=?", orgid)
+			countSQL += " AND r.user_org_id=?"
+			countParams = append(countParams, orgid)
+		}
 		if modetype > 0 {
 			db = db.Where("x.item_id = ?", modetype)
 			countSQL += " AND x.item_id=?"
@@ -1999,26 +2034,26 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 	if lapseto == 2 {
 		d := XTReadDB().Table("xt_patients as s")
 		fmt.Println("d", d)
-		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 2")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 1")
 		table := XTReadDB().Table("xt_quality_control_standard as r")
 		fmt.Println(table)
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0   THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value <> r.range_value)"
+			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value +0 >= r.min_range +0 and x.inspect_value +0 <= r.large_range +0 )"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -2049,6 +2084,11 @@ func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, januaryS
 			countSQL += " AND x.org_id=?"
 			countParams = append(countParams, orgid)
 		}
+		if orgid > 0 {
+			db = db.Where("r.user_org_id=?", orgid)
+			countSQL += " AND r.user_org_id=?"
+			countParams = append(countParams, orgid)
+		}
 		if modetype > 0 {
 			db = db.Where("x.item_id = ?", modetype)
 			countSQL += " AND x.item_id=?"
@@ -2080,20 +2120,20 @@ func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, januar
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value <> r.range_value)"
+			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2) and (x.inspect_value = r.range_value)"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -2124,6 +2164,11 @@ func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, januar
 			countSQL += " AND x.org_id=?"
 			countParams = append(countParams, orgid)
 		}
+		if orgid > 0 {
+			db = db.Where("r.user_org_id=?", orgid)
+			countSQL += " AND r.user_org_id=?"
+			countParams = append(countParams, orgid)
+		}
 		if modetype > 0 {
 			db = db.Where("x.item_id = ?", modetype)
 			countSQL += " AND x.item_id=?"
@@ -2153,20 +2198,20 @@ func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, januar
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1) and (x.inspect_value <> r.range_value)"
+			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1) and (x.inspect_value = r.range_value)"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -2197,6 +2242,11 @@ func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, januar
 			countSQL += " AND x.org_id=?"
 			countParams = append(countParams, orgid)
 		}
+		if orgid > 0 {
+			db = db.Where("r.user_org_id=?", orgid)
+			countSQL += " AND r.user_org_id=?"
+			countParams = append(countParams, orgid)
+		}
 		if modetype > 0 {
 			db = db.Where("x.item_id = ?", modetype)
 			countSQL += " AND x.item_id=?"
@@ -2225,20 +2275,20 @@ func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, januar
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value <> r.range_value  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value = r.range_value  THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value <> r.range_value)"
+			"END AS nnd FROM xt_inspection as x LEFT JOIN xt_quality_control_standard AS r ON r.inspection_minor = x.item_id left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2) and (x.inspect_value = r.range_value)"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -2269,6 +2319,11 @@ func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, januar
 			countSQL += " AND x.org_id=?"
 			countParams = append(countParams, orgid)
 		}
+		if orgid > 0 {
+			db = db.Where("r.user_org_id=?", orgid)
+			countSQL += " AND r.user_org_id=?"
+			countParams = append(countParams, orgid)
+		}
 		if modetype > 0 {
 			db = db.Where("x.item_id = ?", modetype)
 			countSQL += " AND x.item_id=?"
@@ -2355,6 +2410,58 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	return inspection, err
 }
 
+func GetTotalPatientsControl(orgid int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, total int64, err error) {
+	db := readDb.Table("xt_inspection as x").Where("x.status = 1")
+	table := readDb.Table("xt_quality_control_standard as s")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ? and x.inspect_value <> ''", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	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
+	return inspection, total, err
+}
+func GetStandControl(orgid int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, total int64, err error) {
+	db := readDb.Table("xt_inspection as x").Where("x.status = 1")
+	table := readDb.Table("xt_quality_control_standard as s")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ? and x.inspect_value+0 <> 0 and x.inspect_type = 1 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", endtime)
+	}
+	db = db.Where("s.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
+}
+
+func GetStandControlOne(orgid int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, total int64, err error) {
+	db := readDb.Table("xt_inspection as x").Where("x.status = 1")
+	table := readDb.Table("xt_quality_control_standard as s")
+	fmt.Println(table)
+	if orgid > 0 {
+		db = db.Where("x.org_id = ? and x.inspect_value <> '' and x.inspect_type = 2 ", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.inspect_date >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.inspect_date <=?", endtime)
+	}
+	db = db.Where("s.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
+}
+
 func GetInfectiousPatientsControl(orgid int64, lapstor int64, startime int64, endtime int64) (inspection []*models.PatientInspectionCount, err error) {
 	db := readDb.Table("xt_inspection as x").Where("x.status =1")
 	table := readDb.Table("xt_patients as s")
@@ -2492,7 +2599,7 @@ func GetQualityControlById(orgid int64, patientid int64, startime int64, endtime
 	if inspectdate > 0 {
 		db = db.Where("x.inspect_date = ?", inspectdate)
 	}
-	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,r.unit").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").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,r.unit,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.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date asc").Scan(&inspection).Error
 
 	return inspection, err
 }
@@ -2507,7 +2614,7 @@ func GetPatientComplianceDetail(orgid int64, patientid int64, startime int64, en
 	fmt.Println("d2", d2)
 
 	if orgid > 0 {
-		db = db.Where("x.org_id = ?", orgid)
+		db = db.Where("x.org_id = ? and (x.inspect_value <> '' or x.inspect_value+0 <> 0)", orgid)
 	}
 	if patientid > 0 {
 		db = db.Where("x.patient_id = ?", patientid)
@@ -2522,7 +2629,7 @@ func GetPatientComplianceDetail(orgid int64, patientid int64, startime int64, en
 		db = db.Where("x.item_id = ?", itemid)
 	}
 
-	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,r.unit").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").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,r.unit,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.id = x.item_id").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date asc").Scan(&inspection).Error
 
 	return inspection, err
 }