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

 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 3907
+		subscibe.OrgId = 12
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 3907
+		adminUserInfo.CurrentOrgId = 12
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 1
-		subscibe.OrgId = 9538
+		subscibe.OrgId = 12
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 9538
+		adminUserInfo.CurrentOrgId = 12
 		adminUserInfo.CurrentAppId = 18
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/new_mobile_api_controllers/common_api_controller.go

 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid":                 vid,
+			"vid": vid,
 		})
 	} else {
 		itemId, err := service.GetIdByItemId(detail.InspectionMinor, orgId)
 		}
 		this.ServeSuccessJSON(map[string]interface{}{
 			"configurationdetail": detail,
-			"vid":                 itemId.ID,
+			"vid": itemId.ID,
 		})
 	}
 

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

 	}
 
 	var range_value string
+	//if range_type == 1 {
+	//	qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+	//	range_value = qcs.RangeMin + "," + qcs.RangeMax
+	//
+	//} else {
+	//
+	//	inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+	//	for _, item := range inspection {
+	//		if len(range_value) == 0 {
+	//			range_value = item.InspectValue
+	//		} else {
+	//			range_value = range_value + "," + item.InspectValue
+	//		}
+	//	}
+	//}
+
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
-		range_value = qcs.RangeMin + "," + qcs.RangeMax
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
 
 				range_value = range_value + "," + item.InspectValue
 			}
 		}
+
 	}
 
 	data, _ := statistics_service.GetInspectionChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value)
 
 	var range_value string
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.Org.Id)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
 
-		range_value = qcs.RangeMin + "," + qcs.RangeMax
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.Org.Id, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
 
 				range_value = range_value + "," + item.InspectValue
 			}
 		}
+
 	}
 
 	data, _ := statistics_service.GetPatientInspectionBarChartData(adminUserInfo.Org.Id, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value, patient_id)

controllers/pc_index_evaluation_api_controller.go

 	}
 
 	var range_value string
+
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_value = qcs.RangeMin + "," + qcs.RangeMax
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
+
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
 		for _, item := range inspection {
 			if len(range_value) == 0 {
 
 	var range_value string
 	if range_type == 1 {
-		qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
-		range_value = qcs.RangeMin + "," + qcs.RangeMax
+		count, _ := statistics_service.FindOrgInspectionCount(adminUserInfo.CurrentOrgId)
+
+		if count <= 0 {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(0, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+
+		} else {
+			qcs, _ := statistics_service.FindOrgConfigRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
+			range_value = qcs.RangeMin + "," + qcs.RangeMax
+		}
 
 	} else {
+
 		inspection, _ := statistics_service.FindOrgInspectionReferenceRangeTypeValue(adminUserInfo.CurrentOrgId, project_id, item_id)
 		for _, item := range inspection {
 			if len(range_value) == 0 {
 		}
 
 	}
-
 	data, _ := statistics_service.GetPatientInspectionBarChartData(adminUserInfo.CurrentOrgId, theStartTIme, theEndtTIme, project_id, item_id, range_type, range_value, patient_id)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"data": data,

service/dialysis_service.go

 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Prescription", "status = 1 AND user_org_id = ?", orgID).
+		Preload("TreatmentSummary", "status = 1 AND user_org_id = ?", orgID).
 		// Preload("DialysisOrder.MonitoringRecords", "status = 1 AND user_org_id = ?", orgID).
 		Where("status = 1 AND user_org_id = ?", orgID)
 	if scheduleDate != 0 {

service/management_service/management_analyse_service.go

 	db := service.XTReadDB()
 	switch statistics_type {
 	case 1:
-		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 1 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(created_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.created_time >=? AND patient.created_time <=? AND patient.status = 1   AND patient.lapseto = 1  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
 
 		break
 	case 2:
 		//err = db.Raw("select from_unixtime(assessment_date,'%Y-%m-%d') as date, weight_after as value from xt_assessment_after_dislysis  Where status = 1 AND user_org_id = ? AND patient_id = ?  AND assessment_date <= ? AND  assessment_date >= ? ", user_org_id, patient_id, end_time, start_time).Scan(&datas).Error
-		err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		//err = db.Raw("select from_unixtime(lapseto_time,'%m-%d') as date, count(distinct patient_id) as value  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = 2 AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?   Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
+		err = db.Raw("select from_unixtime(created_time,'%m-%d') as date, count(distinct id) as value  from xt_patients patient   Where  patient.user_org_id = ? AND patient.created_time >=? AND patient.created_time <=? AND patient.status = 1   AND patient.lapseto = 2  Group by date", user_org_id, start_time, end_time).Scan(&datas).Error
 
 		break
 	}
 	var err error
 	var patients []*PatientTableStruct
 	readDb := service.XTReadDB()
-	db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
-	err = db.Order("lapseto.lapseto_time desc").Scan(&patients).Error
-	//.Offset(offset).Limit(limit)
+	//db := readDb.Raw("select from_unixtime(lapseto.`lapseto_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type = ? AND lapseto.lapseto_time >= ? AND lapseto.lapseto_time <= ?  ", orgID, statistics_type, start, end)
+	db := readDb.Raw("select from_unixtime(patient.`created_time`,'%Y-%m-%d %H:%m') as date , patient.name as name, patient.`id_card_no` as id_card_no, patient.`gender` as gender  from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?  AND patient.created_time >= ? AND patient.created_time <= ?  ", orgID, statistics_type, start, end)
+	err = db.Order("patient.created_time desc").Scan(&patients).Error
 	return patients, total, err
 }
 
 func GetLapsetoPatientTotal(orgID int64, statistics_type int) (Total int64, err error) {
 	readDb := service.XTReadDB()
-	err = readDb.Raw("select count(*) as total from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type =?", orgID, statistics_type).Count(&Total).Error
+	//err = readDb.Raw("select count(*) as total from xt_patient_lapseto lapseto JOIN `xt_patients` patient ON lapseto.`patient_id` = patient.id AND patient.user_org_id = ? Where lapseto.status = 1 AND lapseto.lapseto_type =?", orgID, statistics_type).Count(&Total).Error
+	err = readDb.Raw("select count(*) as total from `xt_patients` patient Where patient.user_org_id = ? AND patient.status = 1 AND patient.lapseto = ?", orgID, statistics_type).Count(&Total).Error
+
 	return Total, err
 }

service/mobile_dialysis_service.go

 		Preload("AssessmentBeforeDislysis", "status = 1 AND user_org_id = ? AND assessment_date = ? ", orgID, scheduleDate).
 		Preload("DialysisOrder", "status = 1 AND user_org_id = ?", orgID).
 		Preload("Advices", "status = 1 AND user_org_id = ? AND advice_type = 2 ", orgID).
+		Preload("TreatmentMode", "status = 1").
 		Where("sch.status = 1 AND sch.user_org_id = ?", orgID)
 	if scheduleDate != 0 {
 		db = db.Where("schedule_date = ?", scheduleDate)
 	Prescription             *models.DialysisPrescriptionList  `gorm:"ForeignKey:RecordDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"prescription"`
 	AssessmentBeforeDislysis *models.PredialysisEvaluationList `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"assessment_before_dislysis"`
 	Advices                  []*VMDoctorAdvice                 `gorm:"ForeignKey:AdviceDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"doctor_advice"`
+	TreatmentSummary         *models.TreatmentSummary          `gorm:"ForeignKey:AssessmentDate,PatientId;AssociationForeignKey:ScheduleDate,PatientId" json:"treatment_summary"`
 }
 
 func (MDialysisScheduleVM) TableName() string {

service/statistics_service/index_evaluation_service.go

 	db.Table("xt_inspection").Where("org_id=? and status=1 and  inspect_date >= ? and inspect_date <= ? AND project_id = ? AND item_id = ? AND inspect_value <> '' ", user_org_id, start_time, end_time, project_id, item_id).Count(&Total)
 
 	if range_type == 1 {
+
 		tempErr = db.Table("xt_inspection").Where("org_id=? and status=1 and  inspect_date >= ? and inspect_date <= ? AND project_id = ? AND item_id = ? AND inspect_value <> ''", user_org_id, start_time, end_time, project_id, item_id).
 			Select("CASE WHEN inspect_value < " + range_value_arr[0] + " THEN " + "'" + "小于" + range_value_arr[0] + "'" +
 				" WHEN inspect_value >= " + range_value_arr[0] + " AND  inspect_value <= " + range_value_arr[1] + " THEN " + "'" + range_value_arr[0] + "~" + range_value_arr[1] + "'" +