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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 # 1
@@ -142,33 +142,33 @@ aliquid = 83
 [dev]
 mobile_token_expiration_second = 3600
 httpdomain = http://new_mobile.xt.api.sgjyun.com
-sso_domain = https://testsso.sgjyun.com
+sso_domain = http://localhost:8091
 front_end_domain = "http://xt.test.sgjyun.com/#"
 
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readmysqlport = 3306
 readmysqluser = root
 readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = sgj_xt
+readmysqlname = test_xt
 
 writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = root
 writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = sgj_xt
+writemysqlname = test_xt
 
 readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 readuserport = 3306
 readuseruser = root
 readuserpass = 1Q2W3e4r!@#$
-readusername = sgj_users
+readusername = test_users
 
 
 writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
 writeuserport = 3306
 writeuseruser = root
 writeuserpass = 1Q2W3e4r!@#$
-writeusername = sgj_users
+writeusername = test_users
 
 
 

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -177,8 +177,11 @@ func (this *IndexEvaluationApiController) GetPatientInspectionChartData() {
 	}
 
 	data, _ := statistics_service.GetPatientInspectionChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, patient_id)
+	references, _ := statistics_service.FindOrgQualityControlStandardInspectionReferenceById(adminUserInfo.Org.Id, project_id, item_id)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"data": data,
+		"data":       data,
+		"references": references,
 	})
 
 }

service/statistics_service/index_evaluation_service.go

@@ -1764,3 +1764,9 @@ func GetOrgPatients(user_org_id int64) (patient *[]VMPatient, err error) {
 	}
 	return &tempPatient, nil
 }
+
+func FindOrgQualityControlStandardInspectionReferenceById(user_org_id int64, project_id int64, item_id int64) (references InspectionReference, err error) {
+	db := service.XTReadDB()
+	err = db.Raw("Select reference.project_name as project_name,qcs.inspection_major as project_id, qcs.inspection_minor as id,reference.item_name as item_name,qcs.range_type as range_type,reference.range_min as range_min, reference.range_max as range_max,reference.unit as  unit  from xt_quality_control_standard qcs Left JOIN xt_inspection_reference reference ON  qcs.inspection_major = reference.project_id and qcs.inspection_minor = reference.id and  (reference.org_id = ? OR org_id = 0)  Where qcs.user_org_id = ?  AND qcs.status = 1 AND qcs.inspection_major = ? AND qcs.inspection_minor = ?", user_org_id, user_org_id, project_id, item_id).Scan(&references).Error
+	return
+}