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

@@ -712,8 +712,11 @@ func (this *CommonApiController) GetInspectionTatolCount() {
 	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)
+	//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)
 	references, err := service.GetInspectionTotalCount(orgid)
@@ -812,7 +815,10 @@ func (this *CommonApiController) GetPatientList() {
 	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()
+	endTimeYMDHmsStr := endtime + " 23:59:59"
+	endDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endTimeYMDHmsStr)
 	entime := endDate.Unix()
 	fmt.Println("结束日期", entime)
 	limit, _ := this.GetInt64("limit")

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -180,9 +180,12 @@ func (this *NewCommonApiController) GetPrescriptionlist() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-
-	entime := endDate.Unix()
+	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//
+	//entime := endDate.Unix()
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	entime := endtimeStrs.Unix()
 	fmt.Println("开始时间", statime)
 	page, _ := this.GetInt64("page")
 	fmt.Println("page", page)
@@ -192,7 +195,6 @@ func (this *NewCommonApiController) GetPrescriptionlist() {
 	orgId := adminInfo.Org.Id
 	prescriptionList, _ := service.GetAllDialysisList(statime, entime, orgId)
 	list, totallist, err := service.GetDialysisPatientList(statime, entime, page, limit, orgId)
-	fmt.Println("err--------------------", err)
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -314,8 +316,11 @@ func (this *NewCommonApiController) GetMobileInspectionList() {
 	fmt.Println("parseDateErr", parseDateErr)
 	statime := startDate.Unix()
 	fmt.Println("开始时间", statime)
-	endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
-	entime := endDate.Unix()
+	//endDate, _ := utils.ParseTimeStringToTime("2006-01-02", endtime)
+	//entime := endDate.Unix()
+	endtimeStr := endtime + " 23:59:59"
+	endtimeStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", endtimeStr)
+	entime := endtimeStrs.Unix()
 	fmt.Println("结束日期", entime)
 	references, err := service.GetInspectionTotalCount(orgid)
 	if err != nil {
@@ -705,11 +710,14 @@ func (this *NewCommonApiController) GetMobilePatient() {
 	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)
+	decEndStr := endtime + " 23:59:59"
+	decEndStrs, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", decEndStr)
+	entime := decEndStrs.Unix()
 	limit, _ := this.GetInt64("limit")
-	fmt.Println("limit", limit)
+	//fmt.Println("limit", limit)
 	page, _ := this.GetInt64("page")
 	fmt.Println("page", page)
 	patientInfo, total, err := service.GetPatientListData(orgid, statime, entime, limit, page)

service/common_service.go

@@ -313,7 +313,7 @@ func GetDialysisList(startime int64, endtime int64, page int64, limit int64, org
 		db = db.Where("o.dialysis_date<=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join  xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date ").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
+	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join  xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status = 1").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
 	return order, total, err
 
 }
@@ -334,7 +334,7 @@ func GetAllDialysisList(startime int64, endtime int64, orgid int64) (order []*mo
 	if endtime > 0 {
 		db = db.Where("o.dialysis_date<=?", endtime)
 	}
-	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,s.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date ").Scan(&order).Error
+	err = db.Group("s.patient_id,s.mode_id").Select("s.mode_id,s.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status = 1 ").Scan(&order).Error
 	return order, err
 }
 
@@ -355,7 +355,7 @@ func GetDialysisPatientList(startime int64, endtime int64, page int64, limit int
 		db = db.Where("o.dialysis_date<=?", endtime)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("s.patient_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join  xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date ").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
+	err = db.Group("s.patient_id").Select("s.mode_id,o.patient_id,p.name,p.id_card_no,p.dialysis_no,p.total_dialysis,p.user_sys_before_count").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join  xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1 ").Count(&total).Offset(offset).Limit(limit).Scan(&order).Error
 	return order, total, err
 }
 
@@ -445,7 +445,7 @@ func GetTreateInfo(orgID int64, startime int64, endtime int64, lapseto int64, li
 		db = db.Where("p.lapseto = ?", lapseto)
 	}
 	offset := (page - 1) * limit
-	err = db.Group("o.dialysis_date").Select(sql).Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date").Count(&total).Offset(offset).Limit(limit).Scan(&blood).Error
+	err = db.Group("o.dialysis_date").Select(sql).Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1").Count(&total).Offset(offset).Limit(limit).Scan(&blood).Error
 	return blood, total, err
 
 }
@@ -470,7 +470,7 @@ func GetTreatList(orgid int64, startime int64, endtime int64, lapseto int64) (tt
 	if lapseto > 0 {
 		db = db.Where("p.lapseto = ?", lapseto)
 	}
-	err = db.Select("s.mode_id, count(s.mode_id) as number").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date").Group("s.mode_id").Order("s.mode_id asc").Find(&ttd).Error
+	err = db.Select("s.mode_id, count(s.mode_id) as number").Joins("left join xt_schedule as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.schedule_date = o.dialysis_date and s.status = 1").Group("s.mode_id").Order("s.mode_id asc").Find(&ttd).Error
 	return ttd, err
 }
 
@@ -479,7 +479,7 @@ func GetStatistics(orgID int64, startime int64, endtime int64, modeID int64) (dt
 	sql := "s.mode_id,from_unixtime(o.dialysis_date, '%Y%m%d') as date, count(o.dialysis_date) as number"
 	datesql := " o.dialysis_date as date"
 	group := "from_unixtime(o.dialysis_date, '%Y%m%d')"
-	db = db.Table(" xt_dialysis_order AS o").Joins("left join xt_schedule as s on o.patient_id = s.patient_id").Where("s.schedule_date = o.dialysis_date")
+	db = db.Table(" xt_dialysis_order AS o").Joins("left join xt_schedule as s on o.patient_id = s.patient_id").Where("s.schedule_date = o.dialysis_date and s.status =1")
 	if orgID > 0 {
 		db = db.Where("o.user_org_id = ?", orgID)
 	}