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

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -1028,11 +1028,19 @@ func (this *CommonApiController) GetSearchDetailCheck() {
 func (this *CommonApiController) GetNormData() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	//获取系统数据
-	normdata, err := service.GetNormDataByOrgId(orgid)
+	normdata, _ := service.GetNormDataByOrgId(orgid)
 
 	if len(normdata) == 0 {
 		normdata, err := service.GetNormData(0)
-
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"normdata": normdata,
+		})
+	} else {
+		normdata, err := service.GetNormDataByOrgId(orgid)
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 			return
@@ -1041,13 +1049,7 @@ func (this *CommonApiController) GetNormData() {
 			"normdata": normdata,
 		})
 	}
-	if err != nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		return
-	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"normdata": normdata,
-	})
+
 }
 
 func (this *CommonApiController) GetFirstQuarter() {
@@ -1391,9 +1393,8 @@ 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)
-
+	fmt.Println("control", control)
 	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 
 	if err != nil {

service/common_service.go

@@ -79,7 +79,7 @@ func GetConfigurationListTwo(orgid int64, limit int64, page int64) (standard []*
 	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
+		Joins("left join xt_inspection_reference as s on s.item_id = x.inspection_minor and s.project_id = x.inspection_major").Where("s.org_id = ? and s.status = 1", orgid).Offset(offset).Limit(limit).Scan(&standard).Error
 	return standard, total, err
 }
 
@@ -784,7 +784,7 @@ func GetNormDataByOrgId(orgid int64) (standard []*models.QualityControlStandard,
 	fmt.Println(table)
 
 	err = db.Order("x.sort asc,x.created_time asc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name,x.range_value,x.range_type").
-		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Scan(&standard).Error
+		Joins("left join xt_inspection_reference as s on (s.item_id = x.inspection_minor AND s.org_id > 0) OR (s.id = x.inspection_minor AND s.org_id = 0)").Scan(&standard).Error
 	return standard, err
 }
 
@@ -798,7 +798,7 @@ func GetNormData(orgid int64) (standard []*models.QualityControlStandard, err er
 	fmt.Println(table)
 
 	err = db.Order("x.sort asc,x.created_time asc").Group("x.id").Select("x.id,x.inspection_major,x.inspection_minor,x.min_range,x.large_range,x.sort,x.user_org_id,s.unit,s.project_name,s.item_name").
-		Joins("left join xt_inspection_reference as s on s.id = x.inspection_minor").Scan(&standard).Error
+		Joins("left join xt_inspection_reference as s on (s.item_id = x.inspection_minor AND s.org_id > 0) OR (s.id = x.inspection_minor AND s.org_id = 0)").Scan(&standard).Error
 	return standard, err
 }
 
@@ -2405,7 +2405,7 @@ func GetLastPatientsControl(orgid int64, lapstor int64, startime int64, endtime
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.min_range<>''and d.user_org_id = ?", orgid).Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }
@@ -2521,7 +2521,7 @@ func GetInfectiousControl(orgid int64, lapstor int64, startime int64, endtime in
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
-	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Order("x.inspect_date desc").Scan(&inspection).Error
+	err = db.Group("x.id").Select("x.id,x.patient_id,x.item_id,x.item_name,x.inspect_value,x.inspect_date,s.name,s.dialysis_no,r.range_max,r.range_min,d.sort,d.min_range,d.large_range,d.range_value,d.range_type").Joins("left join xt_patients as s on s.id = x.patient_id").Joins("left join xt_inspection_reference as r on r.item_id = x.item_id AND r.org_id > 0 OR ( x.item_id = r.id AND r.org_id = 0)").Joins("left join xt_quality_control_standard as d on d.inspection_minor = x.item_id").Where("d.range_value <>''and d.user_org_id = ?", orgid).Order("x.inspect_date desc").Scan(&inspection).Error
 
 	return inspection, err
 }