提交

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/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

@@ -167,14 +167,30 @@ func (this *CommonApiController) GetConfigurationDetail() {
 
 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() {

service/common_service.go

@@ -2522,7 +2522,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,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 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
 }
@@ -2537,7 +2537,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)
@@ -2552,7 +2552,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
 }