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

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -21,6 +21,7 @@ func (this *CommonApiController) GetInspectionMajor() {
 	adminInfo := this.GetAdminUserInfo()
 	orgid := adminInfo.CurrentOrgId
 	major, err := service.GetInspectionMajor(orgid)
+	fmt.Println("major====================================", major)
 	if len(major) == 0 {
 		major, _ := service.GetInspectionMajor(0)
 		if err != nil {
@@ -708,23 +709,22 @@ func (this *CommonApiController) GetInspectionTatolCount() {
 	startime := this.GetString("startime")
 	fmt.Println(startime)
 	endtime := this.GetString("endtime")
+	fmt.Print("endtime", endtime)
+	patientid, _ := this.GetInt64("patientid")
 	startDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", startime)
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
-	//fmt.Println("开始时间", statime)
-	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	//entime := endDate.Unix()
-	endTimeYMDHmsStr := endtime + " 23:59:59"
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
-	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+	secondQuarterEndStr := endtime + " 23:59:59"
+	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	entime := secondQuarterEnds.Unix()
+
 	references, err := service.GetInspectionTotalCount(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
-	counts, err := service.GetInspectionProjectCount(orgid, statime, entime)
+	counts, err := service.GetInspectionProjectCount(orgid, statime, entime, patientid)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"Inspection": references,
@@ -743,9 +743,9 @@ func (this *CommonApiController) GetInspectionDetailById() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+	secondQuarterEndStr := endtime + " 23:59:59"
+	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	entime := secondQuarterEnds.Unix()
 	patientdetail, err := service.GetInspectionDetailById(id, orgId, statime, entime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -768,9 +768,12 @@ func (this *CommonApiController) GetSearchPatientInfo() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//entime := endDate.Unix()
+	//fmt.Println("结束日期", entime)
+	secondQuarterEndStr := endtime + " 23:59:59"
+	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	entime := secondQuarterEnds.Unix()
 	PatientsInfo, err := service.GetSearchPatientInfo(orgId, patientid, statime, entime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -825,7 +828,8 @@ func (this *CommonApiController) GetPatientList() {
 	page, _ := this.GetInt64("page")
 	fmt.Println("page", page)
 	patientInfo, total, err := service.GetPatientListData(orgid, statime, entime, limit, page)
-	info, _ := service.GetPatientListInfo(orgid, statime, entime)
+
+	info, _ := service.GetPatientListInfo(orgid, statime, entime, limit, page)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -847,9 +851,12 @@ func (this *CommonApiController) GetPatientDetailCheck() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//entime := endDate.Unix()
+	//fmt.Println("结束日期", entime)
+	endTimeYMDHmsStr := endtime + " 23:59:59"
+	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
 	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
 	checkDetail, err := service.GetPatientDetailCheck(id, orgid, statime, entime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/new_mobile_api_controllers/index_evaluation_api_controller.go

@@ -240,6 +240,7 @@ func (this *IndexEvaluationApiController) GetPatientInspectionBarChartData() {
 func (this *IndexEvaluationApiController) GetDialysisProcessIndexChartData() {
 	adminUserInfo := this.GetMobileAdminUserInfo()
 	statistics_type, _ := this.GetInt("statistics_type")
+	fmt.Println("startisct=====================", statistics_type)
 	start_time := this.GetString("start_time")
 	end_time := this.GetString("end_time")
 	patient_id, _ := this.GetInt64("patient_id")

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -316,17 +316,21 @@ func (this *NewCommonApiController) GetMobileInspectionList() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endtimeStr := endtime + " 23:59:59"
-	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
-	entime := endtimeStrs.Unix()
-	fmt.Println("结束日期", entime)
+	//endtimeStr := endtime + " 23:59:59"
+	//endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	//entime := endtimeStrs.Unix()
+	secondQuarterEndStr := endtime + " 23:59:59"
+	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	entime := secondQuarterEnds.Unix()
+	fmt.Println("结束日期==========", entime)
+	patientid, _ := this.GetInt64("patientid")
 	references, err := service.GetInspectionTotalCount(orgid)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
 	}
 
-	counts, err := service.GetInspectionProjectCount(orgid, statime, entime)
+	counts, err := service.GetInspectionProjectCount(orgid, statime, entime, patientid)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"Inspection": references,
@@ -345,9 +349,12 @@ func (this *NewCommonApiController) GetPatientInspectionDetail() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//entime := endDate.Unix()
+	//fmt.Println("结束日期", entime)
+	secondQuarterEndStr := endtime + " 23:59:59"
+	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	entime := secondQuarterEnds.Unix()
 	patientdetail, err := service.GetInspectionDetailById(id, orgId, statime, entime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -370,9 +377,12 @@ func (this *NewCommonApiController) GetSeachPatientDetail() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//entime := endDate.Unix()
+	//fmt.Println("结束日期", entime)
+	secondQuarterEndStr := endtime + " 23:59:59"
+	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	entime := secondQuarterEnds.Unix()
 	PatientsInfo, err := service.GetSearchPatientInfo(orgId, patientid, statime, entime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -719,7 +729,7 @@ func (this *NewCommonApiController) GetMobilePatient() {
 	page, _ := this.GetInt64("page")
 	fmt.Println("page", page)
 	patientInfo, total, err := service.GetPatientListData(orgid, statime, entime, limit, page)
-	info, _ := service.GetPatientListInfo(orgid, statime, entime)
+	info, _ := service.GetPatientListInfo(orgid, statime, entime, limit, page)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -742,9 +752,12 @@ func (this *NewCommonApiController) GetMobilePatientDetailCheck() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	entime := endDate.Unix()
-	fmt.Println("结束日期", entime)
+	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//entime := endDate.Unix()
+	//fmt.Println("结束日期", entime)
+	secondQuarterEndStr := endtime + " 23:59:59"
+	secondQuarterEnds, parseDateErr := utils.ParseTimeStringToTime("2006-01-02 15:04:05", secondQuarterEndStr)
+	entime := secondQuarterEnds.Unix()
 	checkDetail, err := service.GetPatientDetailCheck(id, orgid, statime, entime)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

service/common_service.go

@@ -4,12 +4,13 @@ import (
 	"XT_New/models"
 	"fmt"
 	"github.com/jinzhu/gorm"
+	"strconv"
 	"time"
 )
 
 func GetInspectionMajor(orgid int64) (inspection []*models.XtInspectionReference, err error) {
 
-	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1", orgid).Group("project_name").Order("id asc").Find(&inspection).Error
+	err = XTReadDB().Model(&inspection).Where("org_id = ? and status = 1 and range_type = 1", orgid).Group("project_name").Order("id asc").Find(&inspection).Error
 	return inspection, err
 }
 
@@ -532,7 +533,7 @@ func GetInspectionTotalCount(orgid int64) (configuration []*models.CheckConfigur
 	return configuration, err
 }
 
-func GetInspectionProjectCount(orgid int64, startime int64, endtime int64) (projectCounts []*models.UserInspectionProjectCounts, err error) {
+func GetInspectionProjectCount(orgid int64, startime int64, endtime int64, patientid int64) (projectCounts []*models.UserInspectionProjectCounts, err error) {
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_inspection_reference as r")
@@ -548,8 +549,11 @@ func GetInspectionProjectCount(orgid int64, startime int64, endtime int64) (proj
 	if endtime > 0 {
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
+	if patientid > 0 {
+		db = db.Where("x.patient_id = ?", patientid)
+	}
 
-	err = db.Select("count(distinct x.inspect_date) as count,x.patient_id,x.project_id,r.project_name,t.sort").Joins("left join xt_check_configuration as t on t.inspection_major = x.project_id").Joins("left  join xt_inspection_reference as r on r.project_id = x.project_id").Group("project_id,patient_id").Scan(&projectCounts).Error
+	err = db.Select("count(distinct x.inspect_date) as count,x.patient_id,x.project_id,r.project_name,t.sort").Joins("left join xt_check_configuration as t on t.inspection_major = x.project_id").Joins("left  join xt_inspection_reference as r on r.project_id = x.project_id").Group("x.project_id,x.patient_id").Scan(&projectCounts).Error
 	return
 }
 
@@ -643,7 +647,9 @@ func GetPatientListData(orgid int64, startime int64, endtime int64, limit int64,
 	return inspection, total, err
 }
 
-func GetPatientListInfo(orgid int64, startime int64, endtime int64) (projectCounts []*models.PatientInspectionProjectCount, err error) {
+func GetPatientListInfo(orgid int64, startime int64, endtime int64, limit int64, page int64) (projectCounts []*models.PatientInspectionProjectCount, err error) {
+
+	patients, _, err := GetPatientListData(orgid, startime, endtime, limit, page)
 
 	db := XTReadDB().Table("xt_inspection as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_inspection_reference as r")
@@ -662,7 +668,24 @@ func GetPatientListInfo(orgid int64, startime int64, endtime int64) (projectCoun
 		db = db.Where("x.inspect_date <=?", endtime)
 	}
 
-	err = db.Select("count(distinct x.inspect_date) as count,x.patient_id,x.project_id,r.project_name,s.name").Joins("left join xt_check_configuration as t on t.inspection_major = x.project_id").Joins("left  join xt_inspection_reference as r on r.project_id = x.project_id").Joins("left join xt_patients as s on s.id = x.patient_id").Group("project_id,patient_id").Scan(&projectCounts).Error
+	//if len(ds) > 0 {
+	//  for _, d := range ds {
+	//    dates = append(dates, d.Date)
+	//  }
+	//
+	//  db = db.Where("o.dialysis_date IN (?)", dates)
+	//
+	////}
+
+	selectContent := "CASE"
+	dates := make([]string, 0)
+	for _, item := range patients {
+		selectContent = selectContent + " WHEN x.patient_id =" + strconv.FormatInt(item.PatientId, 10) + " THEN " + "'" + item.Name + "'"
+		dates = append(dates, strconv.FormatInt(item.PatientId, 10))
+	}
+	db = db.Where("x.patient_id in(?)", dates)
+	err = db.Select(selectContent + "ELSE '未知' END AS name,count(distinct x.inspect_date) as count,x.patient_id,x.project_id,r.project_name,s.name").Joins("left join xt_check_configuration as t on t.inspection_major = x.project_id").Joins("left  join xt_inspection_reference as r on r.project_id = x.project_id").Joins("left join xt_patients as s on s.id = x.patient_id").Group("x.project_id,x.patient_id").Scan(&projectCounts).Error
+	//err = db.Select("count(distinct x.inspect_date) as count,x.patient_id,x.project_id,r.project_name,s.name").Joins("left join xt_check_configuration as t on t.inspection_major = x.project_id").Joins("left  join xt_inspection_reference as r on r.project_id = x.project_id").Joins("left join xt_patients as s on s.id = x.patient_id").Group("project_id,patient_id").Scan(&projectCounts).Error
 	return
 }
 

service/statistics_service/index_evaluation_service.go

@@ -111,11 +111,10 @@ func GetDialysisProcessIndexOtherChartData(user_org_id int64, patient_id int64,
 			selectContent = selectContent + " WHEN p.anticoagulant =" + strconv.Itoa(item.Value) + " THEN " + "'" + item.Name + "'"
 
 		}
-		fmt.Println(selectContent)
+		fmt.Println("selectContent 是什么=============================================", selectContent)
 		tempErr = db.Table("xt_dialysis_prescription as p").Where("p.user_org_id=? and p.status=1 and  p.record_date >= ? and p.record_date <= ? AND p.patient_id = ? ", user_org_id, start_time, end_time, patient_id).
 			Select(selectContent +
-				" ELSE '未知' END AS name, COUNT(*) AS total",
-			).Group("p.anticoagulant").Scan(&items).Error
+				" ELSE '未知' END AS name, COUNT(*) AS total").Group("p.anticoagulant").Scan(&items).Error
 
 		break
 	}