医保对接

controllers/base_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
 	"fmt"
 	"strconv"
@@ -69,36 +70,36 @@ type BaseAuthAPIController struct {
 func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 10106
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 10106
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 
 	}
 
@@ -315,35 +316,35 @@ type BaseServeAPIController struct {
 func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
-		//var userAdmin models.AdminUser
-		//userAdmin.Id = 1448
-		//userAdmin.Mobile = "13318599895"
-		//
-		//userAdmin.Id = 597
-		//userAdmin.Mobile = "19874122664"
-		//userAdmin.IsSuperAdmin = false
-		//userAdmin.Status = 1
-		//userAdmin.CreateTime = 1530786071
-		//userAdmin.ModifyTime = 1530786071
-		//var subscibe models.ServeSubscibe
-		//subscibe.ID = 1
-		//subscibe.OrgId = 3877
-		//subscibe.PeriodStart = 1538035409
-		//subscibe.PeriodEnd = 1569571409
-		//subscibe.State = 1
-		//subscibe.Status = 1
-		//subscibe.CreatedTime = 1538035409
-		//subscibe.UpdatedTime = 1538035409
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
-		//subscibes[4] = &subscibe
-		//var adminUserInfo service.AdminUserInfo
-		//adminUserInfo.CurrentOrgId = 3877
-		//adminUserInfo.CurrentAppId = 4
-		//adminUserInfo.AdminUser = &userAdmin
-		//adminUserInfo.Subscibes = subscibes
-		//this.SetSession("admin_user_info", &adminUserInfo)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
-		this.StopRun()
+		var userAdmin models.AdminUser
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
+		userAdmin.Id = 597
+		userAdmin.Mobile = "19874122664"
+		userAdmin.IsSuperAdmin = false
+		userAdmin.Status = 1
+		userAdmin.CreateTime = 1530786071
+		userAdmin.ModifyTime = 1530786071
+		var subscibe models.ServeSubscibe
+		subscibe.ID = 1
+		subscibe.OrgId = 10106
+		subscibe.PeriodStart = 1538035409
+		subscibe.PeriodEnd = 1569571409
+		subscibe.State = 1
+		subscibe.Status = 1
+		subscibe.CreatedTime = 1538035409
+		subscibe.UpdatedTime = 1538035409
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
+		subscibes[4] = &subscibe
+		var adminUserInfo service.AdminUserInfo
+		adminUserInfo.CurrentOrgId = 10106
+		adminUserInfo.CurrentAppId = 4
+		adminUserInfo.AdminUser = &userAdmin
+		adminUserInfo.Subscibes = subscibes
+		this.SetSession("admin_user_info", &adminUserInfo)
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
+		//this.StopRun()
 	}
 
 	//if adminUserInfo.AppRole != nil {

controllers/his_api_controller.go

@@ -100,6 +100,9 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/uncharge/list", &HisApiController{}, "get:GetHisUnChargePatientList")
 
+	beego.Router("/api/monthcharge/info", &HisApiController{}, "get:GetHisMonthChargePatientInfo")
+	beego.Router("/api/monthhispatient/get", &HisApiController{}, "get:GetHisMonthPatientInfo")
+
 }
 
 func (c *HisApiController) GetHisUnChargePatientList() {
@@ -349,8 +352,8 @@ func (c *HisApiController) GetHisPatientInfo() {
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	record_date := c.GetString("record_date")
 	number := c.GetString("number")
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
+	//start_time := c.GetString("start_time")
+	//end_time := c.GetString("end_time")
 	p_type, _ := c.GetInt64("p_type")
 
 	timeLayout := "2006-01-02"
@@ -361,16 +364,16 @@ func (c *HisApiController) GetHisPatientInfo() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	if err != nil {
-
-	}
-	startRecordDateTime := startTime.Unix()
-	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	if err != nil {
-
-	}
-	endRecordDateTime := endTime.Unix()
+	//startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//if err != nil {
+	//
+	//}
+	//startRecordDateTime := startTime.Unix()
+	//endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	//if err != nil {
+	//
+	//}
+	//endRecordDateTime := endTime.Unix()
 	admin := c.GetAdminUserInfo()
 	his_patient_info, _ := service.GetNewHisPatientInfoTwo(admin.CurrentOrgId, his_patient_id, recordDateTime)
 	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
@@ -396,7 +399,7 @@ func (c *HisApiController) GetHisPatientInfo() {
 
 	}
 	//prescriptions, _ := service.GetHisPrescription(admin.CurrentOrgId, patient_id, his_patient_id, recordDateTime)
-	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+	//monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
@@ -409,21 +412,21 @@ func (c *HisApiController) GetHisPatientInfo() {
 	//获取所有科室信息
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"his_info":            his_patient_info,
-		"xt_info":             xt_patient_info,
-		"prescription":        prescriptions,
-		"case_history":        case_history,
-		"info":                patientPrescriptionInfo,
-		"month_prescriptions": monthPrescriptions,
-		"order":               order,
-		"doctors":             doctors,
-		"department":          department,
-		"sch_prescriptions":   sch_prescriptions,
-		"last_prescriptions":  last_prescriptions,
-		"schedule":            sch,
-		"count":               count,
-		"drugStockConfig":     drugStockConfig,
-		"last_info":           lastPatientPrescriptionInfo,
+		"his_info":     his_patient_info,
+		"xt_info":      xt_patient_info,
+		"prescription": prescriptions,
+		"case_history": case_history,
+		"info":         patientPrescriptionInfo,
+		//"month_prescriptions": monthPrescriptions,
+		"order":              order,
+		"doctors":            doctors,
+		"department":         department,
+		"sch_prescriptions":  sch_prescriptions,
+		"last_prescriptions": last_prescriptions,
+		"schedule":           sch,
+		"count":              count,
+		"drugStockConfig":    drugStockConfig,
+		"last_info":          lastPatientPrescriptionInfo,
 	})
 	return
 
@@ -3492,8 +3495,8 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 	patient_id, _ := c.GetInt64("patient_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 	record_date := c.GetString("record_date")
-	start_time := c.GetString("start_time")
-	end_time := c.GetString("end_time")
+	//start_time := c.GetString("start_time")
+	//end_time := c.GetString("end_time")
 	order_status, _ := c.GetInt64("type", 0)
 	p_type, _ := c.GetInt64("p_type", 0)
 	order_id, _ := c.GetInt64("order_id", 0)
@@ -3507,17 +3510,17 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 	}
 	recordDateTime := theTime.Unix()
 
-	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
-	if err != nil {
-
-	}
-	startRecordDateTime := startTime.Unix()
-
-	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
-	if err != nil {
-
-	}
-	endRecordDateTime := endTime.Unix()
+	//startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	//if err != nil {
+	//
+	//}
+	//startRecordDateTime := startTime.Unix()
+	//
+	//endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	//if err != nil {
+	//
+	//}
+	//endRecordDateTime := endTime.Unix()
 
 	admin := c.GetAdminUserInfo()
 	his_patient_info, _ := service.GetNewHisPatientInfo(his_patient_id)
@@ -3533,12 +3536,13 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 		prescriptions, _ = service.GetChargeHisPrescriptionSeven(admin.CurrentOrgId, patient_id, order.Number, p_type)
 	}
 
-	var monthPrescriptions []*models.HisPrescription
-	if order_status == 1 || order_status == 0 {
-		monthPrescriptions, _ = service.GetUnChargeMonthHisPrescriptionThree(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
-	} else if order_status == 2 {
-		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFive(admin.CurrentOrgId, patient_id, order.Number, p_type)
-	}
+	//var monthPrescriptions []*models.HisPrescription
+	//if order_status == 1 || order_status == 0 {
+	//	monthPrescriptions, _ = service.GetUnChargeMonthHisPrescriptionThree(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+	//} else if order_status == 2 {
+	//	monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFive(admin.CurrentOrgId, patient_id, order.Number, p_type)
+	//}
+
 	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
 	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
 
@@ -3549,16 +3553,16 @@ func (c *HisApiController) GetHisChargePatientInfo() {
 	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
-		"his_info":            his_patient_info,
-		"xt_info":             xt_patient_info,
-		"prescription":        prescriptions,
-		"case_history":        case_history,
-		"info":                patientPrescriptionInfo,
-		"last_info":           lastPatientPrescriptionInfo,
-		"month_prescriptions": monthPrescriptions,
-		"order":               order,
-		"doctors":             doctors,
-		"department":          department,
+		"his_info":     his_patient_info,
+		"xt_info":      xt_patient_info,
+		"prescription": prescriptions,
+		"case_history": case_history,
+		"info":         patientPrescriptionInfo,
+		"last_info":    lastPatientPrescriptionInfo,
+		//"month_prescriptions": monthPrescriptions,
+		"order":      order,
+		"doctors":    doctors,
+		"department": department,
 	})
 	return
 
@@ -5040,3 +5044,131 @@ func (this *HisApiController) ChangeMedType() {
 	}
 
 }
+
+func (c *HisApiController) GetHisMonthChargePatientInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	record_date := c.GetString("record_date")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	order_status, _ := c.GetInt64("type", 0)
+	p_type, _ := c.GetInt64("p_type", 0)
+	order_id, _ := c.GetInt64("order_id", 0)
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+
+	admin := c.GetAdminUserInfo()
+	his_patient_info, _ := service.GetNewHisPatientInfo(his_patient_id)
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+
+	order, _ := service.GetHisOrderByID(order_id)
+
+	var monthPrescriptions []*models.HisPrescription
+	if order_status == 1 || order_status == 0 {
+		monthPrescriptions, _ = service.GetUnChargeMonthHisPrescriptionThree(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+	} else if order_status == 2 {
+		monthPrescriptions, _ = service.GetChargeMonthHisPrescriptionFive(admin.CurrentOrgId, patient_id, order.Number, p_type)
+	}
+
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+
+	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+
+	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"his_info":            his_patient_info,
+		"xt_info":             xt_patient_info,
+		"case_history":        case_history,
+		"info":                patientPrescriptionInfo,
+		"last_info":           lastPatientPrescriptionInfo,
+		"month_prescriptions": monthPrescriptions,
+		"order":               order,
+		"doctors":             doctors,
+		"department":          department,
+	})
+	return
+}
+
+func (c *HisApiController) GetHisMonthPatientInfo() {
+	patient_id, _ := c.GetInt64("patient_id")
+	his_patient_id, _ := c.GetInt64("his_patient_id")
+	record_date := c.GetString("record_date")
+	number := c.GetString("number")
+	start_time := c.GetString("start_time")
+	end_time := c.GetString("end_time")
+	p_type, _ := c.GetInt64("p_type")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+	startTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+	if err != nil {
+
+	}
+	startRecordDateTime := startTime.Unix()
+	endTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+	if err != nil {
+
+	}
+	endRecordDateTime := endTime.Unix()
+	admin := c.GetAdminUserInfo()
+	his_patient_info, _ := service.GetNewHisPatientInfoTwo(admin.CurrentOrgId, his_patient_id, recordDateTime)
+	xt_patient_info, _ := service.GetXTPatientInfo(admin.CurrentOrgId, patient_id)
+
+	count, _ := service.GetHisPatientCount(admin.CurrentOrgId, patient_id, recordDateTime)
+
+	monthPrescriptions, _ := service.GetMonthHisPrescriptionTwo(admin.CurrentOrgId, patient_id, startRecordDateTime, endRecordDateTime, p_type)
+	case_history, _ := service.GetHisPatientCaseHistoryInfo(admin.CurrentOrgId, patient_id, recordDateTime)
+	patientPrescriptionInfo, _ := service.FindPatientPrescriptionInfo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+	lastPatientPrescriptionInfo, _ := service.FindLastPatientPrescriptionInfoTwo(admin.CurrentOrgId, patient_id, recordDateTime, p_type)
+
+	order, _ := service.GetHisOrder(admin.CurrentOrgId, number, patient_id)
+	doctors, _ := service.GetHisAdminUserDoctors(admin.CurrentOrgId)
+
+	_, drugStockConfig := service.FindDrugStockAutomaticReduceRecordByOrgId(admin.CurrentOrgId)
+	//获取所有科室信息
+	department, _ := service.GetAllDepartMent(admin.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"his_info":            his_patient_info,
+		"xt_info":             xt_patient_info,
+		"case_history":        case_history,
+		"info":                patientPrescriptionInfo,
+		"month_prescriptions": monthPrescriptions,
+		"order":               order,
+		"doctors":             doctors,
+		"department":          department,
+		"count":               count,
+		"drugStockConfig":     drugStockConfig,
+		"last_info":           lastPatientPrescriptionInfo,
+	})
+	return
+
+}

service/schedule_service.go

@@ -583,7 +583,7 @@ func GetWeekDayScheduleById(orgid int64, scheduleDate int64, scheduleType int64,
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id desc")
+		return db.Where("status =1").Order("id asc")
 	}).Find(&list).Error
 
 	return list, err
@@ -608,7 +608,7 @@ func GetWeekDayScheduleByIdTwo(orgid int64, scheduleDate int64, scheduleType int
 	err = db.Select("x.id,x.user_org_id,x.partition_id,x.bed_id,x.patient_id,x.schedule_date,x.schedule_type,x.schedule_week,x.mode_id,x.is_export").Preload("XtPatients", "status = 1").Preload("DeviceZone", "status = 1").Preload("DeviceNumber", "status = 1").Preload("DialysisOrder", "status = 1").Preload("DoctorAdvice", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status =1 and parent_id = 0").Preload("ChildDoctorAdvice", "status = 1")
 	}).Preload("HisDoctorAdviceInfo", "status = 1").Preload("DialysisPrescription", "status = 1").Preload("DialysisSolution", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status =1").Order("id desc")
+		return db.Where("status =1").Order("id asc")
 	}).Find(&list).Error
 
 	return list, err