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

controllers/data_api_controller.go

@@ -228,7 +228,7 @@ func (c *DataApiController) UpdateChildConfig() {
 	//	dataconfig.Order = 0
 	//}
 	configOrgId := int64(dataBody["org_id"].(float64))
-
+	fmt.Println("configOrgId=========================", configOrgId)
 	// 验证关键字段的值是否重复
 	// configId := int64(dataBody["id"].(float64))
 	// thisConfig,_:=service.FindConfigByNameForUpdate(dataconfig.Module, dataconfig.Name,dataconfig.ParentId,dataconfig.OrgId,configId)

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -215,6 +215,10 @@ func (this *CommonApiController) UpdateConfiguration() {
 		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 {
@@ -224,6 +228,7 @@ func (this *CommonApiController) UpdateConfiguration() {
 	this.ServeSuccessJSON(map[string]interface{}{
 		"standard": standard,
 	})
+
 }
 
 func (this *CommonApiController) DeleteConfiguration() {
@@ -950,7 +955,7 @@ func (this *CommonApiController) GetFirstQuarter() {
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
-	fmt.Println("开始时间=====================================", statime)
+	fmt.Println("开始时间", statime)
 	endtime := this.GetString("endtime")
 	fmt.Println("endtime", endtime)
 	endTimeYMDHmsStr := endtime + " 23:59:59"
@@ -1054,6 +1059,20 @@ func (this *CommonApiController) GetProjectList() {
 		})
 	}
 
+	if rangetype == 2 {
+		list, err := service.GetProjectListOne(orgid, lapseto, modetype, statime, entime, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//统计达标个数
+		standList, err := service.GetProjectStandListOne(orgid, lapseto, modetype, statime, entime, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"standList": standList,
+		})
+	}
 }
 
 func (this *CommonApiController) GetMonthProjectList() {
@@ -1210,20 +1229,39 @@ func (this *CommonApiController) GetMonthProjectList() {
 	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
 	decEndStrsUnix := decEndStrs.Unix()
 	fmt.Println("12月末", decEndStrsUnix)
-	//统计总共
-	monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
-	//统计不合格
-	monthNolist, err := service.GetMonthProjectListTwo(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
-	fmt.Println("monthnolist=====", monthNolist)
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
+	rangetype, _ := this.GetInt64("range_type")
+	fmt.Println("range_type", rangetype)
+	if rangetype == 1 {
+		//统计总共
+		monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+		//统计不合格
+		monthNolist, err := service.GetMonthProjectListTwo(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+		fmt.Println("monthnolist", monthNolist)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"monthlist":   monthlist,
+			"monthNolist": monthNolist,
+		})
+	}
+
+	if rangetype == 2 {
+		monthlist, err := service.GetMonthProjectListOne(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+		monthNolist, err := service.GetMonthProjectListThree(orgid, lapseto, modetype, 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{}{
+			"monthlist":   monthlist,
+			"monthNolist": monthNolist,
+		})
 	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"monthlist":   monthlist,
-		"monthNolist": monthNolist,
-	})
 }
 
 func (this *CommonApiController) GetPatientscontrol() {

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -193,6 +193,7 @@ func (this *NewCommonApiController) GetPrescriptionlist() {
 	fmt.Println("limit", limit)
 	adminInfo := this.GetMobileAdminUserInfo()
 	orgId := adminInfo.Org.Id
+	count, _ := service.TotalDialysisCount(statime, entime, orgId)
 	prescriptionList, _ := service.GetAllDialysisList(statime, entime, orgId)
 	list, totallist, err := service.GetDialysisPatientList(statime, entime, page, limit, orgId)
 	if err != nil {
@@ -203,6 +204,7 @@ func (this *NewCommonApiController) GetPrescriptionlist() {
 		"list":             list,
 		"totallist":        totallist,
 		"prescriptionList": prescriptionList,
+		"count":            count,
 	})
 }
 
@@ -469,9 +471,9 @@ func (this *NewCommonApiController) GetMobileProjectlsit() {
 	fourQuarterEnds, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", fourQuarterEndStr)
 	fourQuarterEndStrUnix := fourQuarterEnds.Unix()
 	//fmt.Println("第四季度结束时间", fourQuarterEndStrUnix)
-
+	rangetype, _ := this.GetInt64("range_type")
 	//按季度统计
-	if itemtype == 1 {
+	if rangetype == 1 {
 		//统计总共
 		list, err := service.GetProjectList(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
 		//统计达标个数
@@ -486,6 +488,21 @@ func (this *NewCommonApiController) GetMobileProjectlsit() {
 			"standList": standList,
 		})
 	}
+
+	if rangetype == 2 {
+		list, err := service.GetProjectListOne(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		//统计达标个数
+		standList, err := service.GetProjectStandListOne(orgid, lapseto, modetype, firstQuarterStartUnix, fourQuarterEndStrUnix, firstQuarterStartUnix, fisrtQuarterEndStrUnix, secondeQuarterStartUnix, secondQuarterEndStrUnix, threeQuarterStartUnix, threeQuarterEndStrUnix, fourQuarterStartUnix, fourQuarterEndStrUnix)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":      list,
+			"standList": standList,
+		})
+	}
 }
 
 func (this *NewCommonApiController) GetMobileFirstQuarter() {
@@ -506,15 +523,15 @@ func (this *NewCommonApiController) GetMobileFirstQuarter() {
 	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
 	entime := endDate.Unix()
 	fmt.Println("结束日期", entime)
-	//group, parseDateErr := service.GetItemNameGroup(orgid, statime, entime)
-	//quarter, err := service.GetFirstQuarter(orgid, statime, entime)
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto)
+	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"count": count,
+		"count":   count,
+		"countwo": countwo,
 	})
 }
 
@@ -670,19 +687,38 @@ func (this *NewCommonApiController) GetMobileMonthProjectList() {
 	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
 	decEndStrsUnix := decEndStrs.Unix()
 	fmt.Println("12月末", decEndStrsUnix)
-	//统计总共
-	monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
-	//统计不合格
-	monthNolist, err := service.GetMonthProjectListTwo(orgid, lapseto, modetype, 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
+	range_type, _ := this.GetInt64("range_type")
+	if range_type == 1 {
+		//统计总共
+		monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+		//统计不合格
+		monthNolist, err := service.GetMonthProjectListTwo(orgid, lapseto, modetype, 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{}{
+			"monthlist":   monthlist,
+			"monthNolist": monthNolist,
+		})
+	}
+	if range_type == 2 {
+		//统计总共
+		monthlist, err := service.GetMonthProjectList(orgid, lapseto, modetype, januaryStartStrUnix, januaryEndStrUnix, febStartStrStrUnix, febEndStrUnix, marchStartStrUnix, marchEndStrUnix, aprStartStrUnix, aprEndStrsUnix, mayStartStrUnix, mayEndStrsUnix, junStartStrUnix, junEndStrsUnix, julStartStrUnix, julEndStrsUnix, augStartStrUnix, augEndStrsUnix, sepStartStrUnix, sepEndStrsUnix, octStartStrUnix, octEndStrsUnix, novStartStrUnix, novEndStrsUnix, decStartStrUnix, decEndStrsUnix)
+		//统计不合格
+		monthNolist, err := service.GetMonthProjectListThree(orgid, lapseto, modetype, 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{}{
+			"monthlist":   monthlist,
+			"monthNolist": monthNolist,
+		})
 	}
 
-	this.ServeSuccessJSON(map[string]interface{}{
-		"monthlist":   monthlist,
-		"monthNolist": monthNolist,
-	})
 }
 
 func (this *NewCommonApiController) GetAllMobileMajorInspection() {

models/common_models.go

@@ -388,11 +388,9 @@ type PatientInspectionProjectCount struct {
 }
 
 type ProjectCountOne struct {
-	Total      string
-	Count      int64
-	NoCount    int64
-	MinRange   string `gorm:"column:min_range" json:"min_range" form:"min_range"`
-	LargeRange string `gorm:"column:large_range" json:"large_range" form:"large_range"`
+	Total   string
+	Count   int64
+	NoCount int64
 }
 
 type ProjectCount struct {

service/common_service.go

@@ -1026,20 +1026,20 @@ func GetProjectStandList(orgid int64, lapseto int64, modetype int64, startime in
 	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")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_value<> ''")
 		table := XTReadDB().Table("xt_inspection_reference as r")
-		//q := XTReadDB().Table("xt_quality_control_standard as q")
-		//fmt.Println("q",q)
+		q := XTReadDB().Table("xt_quality_control_standard as r")
+		fmt.Println("q", q)
 		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+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '第一季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <=  r.range_max+0 THEN '第二季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第三季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+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_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) 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.range_min + 0 AND x.inspect_value + 0 <= range_max+0)"
+			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) 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, firststart)
 		countParams = append(countParams, firstend)
@@ -1054,6 +1054,12 @@ func GetProjectStandList(orgid int64, lapseto int64, modetype int64, startime in
 			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)
@@ -1078,18 +1084,20 @@ func GetProjectStandList(orgid int64, lapseto int64, modetype int64, startime in
 	if lapseto == 1 {
 		d := XTReadDB().Table("xt_patients as s")
 		fmt.Println("d", d)
-		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_value<> ''")
 		table := XTReadDB().Table("xt_inspection_reference as r")
+		q := XTReadDB().Table("xt_quality_control_standard as r")
+		fmt.Println("q", q)
 		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+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '第一季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第二季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第三季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+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_inspection_reference as  r on r.id = 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.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) 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, firststart)
 		countParams = append(countParams, firstend)
@@ -1104,6 +1112,12 @@ func GetProjectStandList(orgid int64, lapseto int64, modetype int64, startime in
 			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)
@@ -1124,22 +1138,86 @@ func GetProjectStandList(orgid int64, lapseto int64, modetype int64, startime in
 		countSQL += ")a GROUP BY nnd"
 		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
 	}
+	return
+}
 
-	if lapseto == 2 {
+func GetProjectStandListOne(orgid int64, lapseto int64, modetype int64, startime int64, endtime int64, firststart int64, firstend int64, sencondstart int64, sencondend int64, threestart int64, threeend int64, fourstart int64, fourend int64) (inspection []*models.ProjectCount, err error) {
+
+	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")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 x.inspect_type = 2")
+		table := XTReadDB().Table("xt_inspection_reference as r")
+		q := XTReadDB().Table("xt_quality_control_standard as r")
+		fmt.Println("q", q)
+		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 '第四季度'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) 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, 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)
+
+		}
+		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=?"
+			countParams = append(countParams, modetype)
+		}
+		if startime > 0 {
+			db = db.Where("x.inspect_date >= ? ", startime)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, startime)
+		}
+		if endtime > 0 {
+			db = db.Where("x.inspect_date <= ?", endtime)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, endtime)
+		}
+
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	if lapseto == 1 {
+		d := XTReadDB().Table("xt_patients as s")
+		fmt.Println("d", d)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 x.inspect_type = 2")
 		table := XTReadDB().Table("xt_inspection_reference as r")
+		q := XTReadDB().Table("xt_quality_control_standard as r")
+		fmt.Println("q", q)
 		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+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '第一季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第二季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 THEN '第三季度'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? AND x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0 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_inspection_reference as  r on r.id = 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.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+			"END AS nnd FROM xt_inspection as x  left join xt_quality_control_standard as  r on (r.inspection_minor = x.item_id AND r.user_org_id > 0) OR ( x.item_id = r.inspection_minor AND r.user_org_id = 0) 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, firststart)
 		countParams = append(countParams, firstend)
@@ -1154,6 +1232,12 @@ func GetProjectStandList(orgid int64, lapseto int64, modetype int64, startime in
 			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)
@@ -1183,7 +1267,7 @@ func GetMonthProjectList(orgid int64, lapseto int64, modetype int64, januaryStar
 
 		d := XTReadDB().Table("xt_patients as s")
 		fmt.Println("d", d)
-		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_value <> 0 and x.inspect_type = 1")
 
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
@@ -1255,7 +1339,7 @@ func GetMonthProjectList(orgid int64, lapseto int64, modetype int64, januaryStar
 
 		d := XTReadDB().Table("xt_patients as s")
 		fmt.Println("d", d)
-		db := readDb.Table("xt_inspection as x ").Where("x.status=1")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_value <> 0 and x.inspect_type = 1 ")
 
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
@@ -1326,7 +1410,7 @@ func GetMonthProjectList(orgid int64, lapseto int64, modetype int64, januaryStar
 	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")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 x.inspect_value <> 0 and x.inspect_type = 1")
 
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
@@ -1396,31 +1480,31 @@ func GetMonthProjectList(orgid int64, lapseto int64, modetype int64, januaryStar
 	return
 }
 
-func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, 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.ProjectCount, err error) {
-	fmt.Println("lapseto=======", lapseto)
+func GetMonthProjectListOne(orgid int64, lapseto int64, modetype int64, 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.ProjectCountOne, err error) {
+
 	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")
-		table := XTReadDB().Table("xt_inspection_reference as r")
-		fmt.Println(table)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 2")
+
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = 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.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2)"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -1474,26 +1558,25 @@ 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")
-		table := XTReadDB().Table("xt_inspection_reference as r")
-		fmt.Println(table)
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1  and and x.inspect_type = 2")
+
 		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
 			"SELECT " +
 			"CASE " +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十二月'" +
 			" ELSE '其他'" +
-			"END AS nnd FROM xt_inspection as x left join xt_inspection_reference as  r on r.id = 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.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1)"
 		countParams := make([]interface{}, 0)
 		countParams = append(countParams, januaryStartStrUnix)
 		countParams = append(countParams, januaryEndStrUnix)
@@ -1546,26 +1629,616 @@ 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")
-		table := XTReadDB().Table("xt_inspection_reference as r")
+		db := readDb.Table("xt_inspection as x ").Where("x.status=1 and x.inspect_type = 2")
+
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '二月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '三月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '四月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '五月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '六月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '七月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '八月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '九月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十一月'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '十二月'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2)"
+		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)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+	return
+}
+
+func GetProjectListOne(orgid int64, lapseto int64, modetype int64, startime int64, endtime int64, firststart int64, firstend int64, sencondstart int64, sencondend int64, threestart int64, threeend int64, fourstart int64, fourend int64) (inspection []*models.ProjectCountOne, err error) {
+
+	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")
+
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第一季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第二季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第三季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第四季度'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x  left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 1 or s.lapseto = 2)"
+		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)
+
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if startime > 0 {
+			db = db.Where("x.inspect_date >= ?", startime)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, startime)
+		}
+		if endtime > 0 {
+			db = db.Where("x.inspect_date <= ?", endtime)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, endtime)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	if lapseto == 1 {
+		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")
+
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第一季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第二季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第三季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第四季度'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x  left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2)"
+		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)
+
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if startime > 0 {
+			db = db.Where("x.inspect_date >= ?", startime)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, startime)
+		}
+		if endtime > 0 {
+			db = db.Where("x.inspect_date <= ?", endtime)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, endtime)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	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")
+
+		countSQL := "SELECT nnd AS 'total',COUNT(*) AS 'count' FROM(" +
+			"SELECT " +
+			"CASE " +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第一季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第二季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第三季度'" +
+			" WHEN x.inspect_date>=? AND  x.inspect_date<=? THEN '第四季度'" +
+			" ELSE '其他'" +
+			"END AS nnd FROM xt_inspection as x left join xt_patients as s on s.id = x.patient_id  WHERE x.status=1 and (s.lapseto = 2)"
+		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)
+
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+
+		if startime > 0 {
+			db = db.Where("x.inspect_date >= ?", startime)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, startime)
+		}
+		if endtime > 0 {
+			db = db.Where("x.inspect_date <= ?", endtime)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, endtime)
+		}
+
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+
+	}
+	return
+}
+
+func GetMonthProjectListTwo(orgid int64, lapseto int64, modetype int64, 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.ProjectCount, err error) {
+	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")
+		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 '十二月'" +
+			" 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)"
+		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)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	if lapseto == 1 {
+
+		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")
+		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 '十二月'" +
+			" 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)"
+		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)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	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")
+		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 '十二月'" +
+			" 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)"
+		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)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+	return
+}
+
+func GetMonthProjectListThree(orgid int64, lapseto int64, modetype int64, 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.ProjectCount, err error) {
+	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")
+		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 '十二月'" +
+			" 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)"
+		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)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	if lapseto == 1 {
+
+		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")
+		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 '十二月'" +
+			" 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)"
+		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)
+		}
+		if modetype > 0 {
+			db = db.Where("x.item_id = ?", modetype)
+			countSQL += " AND x.item_id=?"
+			countParams = append(countParams, modetype)
+		}
+		if januaryStartStrUnix > 0 {
+			db = db.Where("x.inspect_date >= ?", januaryStartStrUnix)
+			countSQL += " AND x.inspect_date >=?"
+			countParams = append(countParams, januaryStartStrUnix)
+		}
+		if decEndStrsUnix > 0 {
+			db = db.Where("x.inspect_date <= ?", decEndStrsUnix)
+			countSQL += " AND x.inspect_date <=?"
+			countParams = append(countParams, decEndStrsUnix)
+		}
+		countSQL += ")a GROUP BY nnd"
+		err = readDb.Raw(countSQL, countParams...).Scan(&inspection).Error
+	}
+
+	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")
+		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+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '二月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '三月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '四月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '五月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '六月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '七月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '八月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '九月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  THEN '十一月'" +
-			" WHEN x.inspect_date>=? AND  x.inspect_date<=? and x.inspect_value+0>=r.range_min+0 and x.inspect_value +0 <= r.range_max+0  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_inspection_reference as  r on r.id = 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.range_min + 0 AND x.inspect_value + 0 <= r.range_max + 0)"
+			"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)

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) SELECT ?,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status FROM xt_quality_control_standard where user_org_id = 0", org_id).Error
+	err = readDb.Exec("INSERT INTO xt_quality_control_standard(user_org_id,inspection_major,inspection_minor,min_range,large_range,sort,created_time,status,range_type,range_value) 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
 	return
 }