医保对接

service/common_service.go

@@ -621,7 +621,6 @@ func GetTreateInfo(orgID int64, startime int64, endtime int64, lapseto int64, li
 
 	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status =  1")
 	sql := "from_unixtime(o.dialysis_date, '%Y%m%d') AS date"
-
 	if orgID > 0 {
 		db = db.Where("o.user_org_id = ?", orgID)
 	}
@@ -637,15 +636,12 @@ func GetTreateInfo(orgID int64, startime int64, endtime int64, lapseto int64, li
 	if lapseto > 0 {
 		db = db.Where("p.lapseto = ?", lapseto)
 	}
-	offset := (page - 1) * limit
-	err = db.Group("o.dialysis_date").Select(sql).Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.record_date = o.dialysis_date and s.status =1").Count(&total).Offset(offset).Limit(limit).Scan(&blood).Error
+	err = db.Group("o.dialysis_date").Select(sql).Joins("join xt_dialysis_prescription as s on s.patient_id = o.patient_id AND s.record_date = o.dialysis_date AND s.mode_id > 0").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.record_date = o.dialysis_date and s.status =1").Scan(&blood).Error
 	return blood, total, err
 
 }
 func GetTreatList(orgid int64, startime int64, endtime int64, lapseto int64) (ttd []*models.TreatTotalStruct, err error) {
-	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status =  1")
-	table := XTReadDB().Table("xt_schedule as s")
-	fmt.Println(table)
+	db := XTReadDB().Table("xt_dialysis_order as o").Where("o.status =  1 ")
 	p := XTReadDB().Table("xt_patients as p")
 	fmt.Println(p)
 	if orgid > 0 {
@@ -663,7 +659,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("join xt_dialysis_prescription as s on s.patient_id = o.patient_id").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.record_date = o.dialysis_date and s.status = 1").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("join xt_dialysis_prescription as s on s.patient_id = o.patient_id and s.record_date = o.dialysis_date and s.mode_id > 0").Joins("left join xt_patients as p on p.id = o.patient_id").Where("s.record_date = o.dialysis_date and s.status = 1").Group("s.mode_id").Order("s.mode_id asc").Find(&ttd).Error
 	return ttd, err
 }
 
@@ -672,7 +668,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("join xt_dialysis_prescription as s on o.patient_id = s.patient_id").Where("s.record_date = o.dialysis_date and s.status =1")
+	db = db.Table(" xt_dialysis_order AS o").Joins("join xt_dialysis_prescription as s on o.patient_id = s.patient_id AND s.mode_id > 0").Where("s.record_date = o.dialysis_date and s.status =1")
 	if orgID > 0 {
 		db = db.Where("o.user_org_id = ?", orgID)
 	}

service/his_service.go

@@ -430,7 +430,7 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64, p_typ
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
 		}).
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
-			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
 		}).
 		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ?", org_id, record_date, patient_id, p_type).
 		Find(&prescription).Error

service/statistics_service/index_evaluation_service.go

@@ -1162,19 +1162,23 @@ func GetDoctorWorkloadChartData(user_org_id int64, start_time int64, end_time in
 	userDb := service.UserReadDB()
 	db := service.XTReadDB()
 	if admin_user_id == 0 {
-		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 2 ", user_org_id).Scan(&datas)
+		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ? AND user_type = 2 ", user_org_id).Scan(&datas)
 	} else {
 		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 2  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
+	var sys_datas VMUserAdminRole
+	sys_datas.AdminUserId = 0
+	sys_datas.PCount = 0
+	sys_datas.UserName = "系统"
+	datas = append(datas, &sys_datas)
 
 	switch statistics_type {
 	case 1:
 		var Total int64
-		db.Table("xt_dialysis_prescription as p").Joins("join xt_schedule sch On sch.schedule_date = p.record_date AND sch.patient_id = p.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("p.user_org_id = ? AND p.status = 1  AND p.record_date >= ? AND  p.record_date <= ? AND p.creater <> 0 ", user_org_id, start_time, end_time).Count(&Total)
-
+		db.Table("xt_dialysis_prescription as p").Joins("join xt_dialysis_order o On o.dialysis_date = p.record_date AND o.patient_id = p.patient_id  AND o.status = 1").Where("p.user_org_id = ? AND p.status = 1  AND p.record_date >= ? AND  p.record_date <= ? AND p.mode_id > 0 ", user_org_id, start_time, end_time).Count(&Total)
 		for _, item := range datas {
 			var total int64
-			db.Table("xt_dialysis_prescription as p").Joins("join xt_schedule sch On sch.schedule_date = p.record_date AND sch.patient_id = p.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("p.user_org_id = ? AND p.status = 1 AND p.creater = ? AND p.record_date >= ? AND  p.record_date <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&total)
+			db.Table("xt_dialysis_prescription as p").Joins("join xt_dialysis_order o On o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND o.status = 1").Where("p.user_org_id = ? AND p.status = 1 AND p.creater = ? AND p.record_date >= ? AND  p.record_date <= ? AND p.mode_id > 0", user_org_id, item.AdminUserId, start_time, end_time).Count(&total)
 			item.PCount = total
 
 			if math.IsNaN(float64(item.PCount) / float64(Total)) {
@@ -1241,11 +1245,17 @@ func GetDoctorWorkloadTableData(user_org_id int64, start_time int64, end_time in
 	} else {
 		userDb.Raw("select admin_user_id, user_name,org_id  from sgj_user_admin_role  Where status = 1 AND org_id = ?  AND user_type = 2  AND admin_user_id = ?", user_org_id, admin_user_id).Scan(&datas)
 	}
+	var sys_datas VMUserAdminRole
+	sys_datas.AdminUserId = 0
+	sys_datas.PCount = 0
+	sys_datas.UserName = "系统"
+	datas = append(datas, &sys_datas)
+
 	for _, item := range datas {
 		var Total int64
 		var TotalOne int64
 		var TotalTwo int64
-		db.Table("xt_dialysis_prescription as p").Joins("join xt_schedule sch On sch.schedule_date = p.record_date AND sch.patient_id = p.patient_id AND sch.user_org_id = ? AND sch.status = 1", user_org_id).Where("p.user_org_id = ? AND p.status = 1 AND p.creater = ?  AND p.record_date >= ? AND  p.record_date <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
+		db.Table("xt_dialysis_prescription as p").Joins("join xt_dialysis_order o On o.dialysis_date = p.record_date AND o.patient_id = p.patient_id AND o.user_org_id = ? AND o.status = 1", user_org_id).Where("p.user_org_id = ? AND p.status = 1 AND p.creater = ?  AND p.record_date >= ? AND  p.record_date <= ? AND p.mode_id > 0", user_org_id, item.AdminUserId, start_time, end_time).Count(&Total)
 		db.Table("xt_patient_course_of_disease as course").Where("org_id = ? AND status = 1 AND recorder = ? AND record_time >= ? AND record_time <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalOne)
 		db.Table("xt_patient_rescue_record as rescue").Where("org_id = ? AND status = 1 AND recorder = ? AND record_time >= ? AND record_time <= ?", user_org_id, item.AdminUserId, start_time, end_time).Count(&TotalTwo)
 		item.PCount = Total