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

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -6250,3 +6250,19 @@ func (c *DialysisAPIController) GetSchedule() {
 	})
 
 }
+
+func (this *DialysisAPIController) GetBloodDialysisPatient() {
+	//adminUser := this.GetAdminUserInfo()
+	//orgId := adminUser.CurrentOrgId
+	//fmt.Print("orgId")
+	patient, err := service.GetBloodDialysisPatient(7957)
+	fmt.Print(patient)
+	fmt.Print("报错------------------", err)
+	//if err != nil {
+	//  this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+	//  return
+	//}
+	//this.ServeSuccessJSON(map[string]interface{}{
+	//  "patient": patient,
+	//})
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -110,4 +110,5 @@ func MobileAPIControllersRegisterRouters() {
 
 	beego.Router("/m/api/schedule/get", &DialysisAPIController{}, "Get:GetSchedule")
 
+	beego.Router("/api/patient/getbloodDialysisPatient", &DialysisAPIController{}, "Get:GetBloodDialysisPatient")
 }

controllers/patientManage_api_controller.go

@@ -0,0 +1,33 @@
+package controllers
+
+import (
+	"XT_New/controllers/mobile_api_controllers"
+	"XT_New/enums"
+	"XT_New/service"
+	"fmt"
+	"github.com/astaxie/beego"
+)
+
+type PatientAPIController struct {
+	//controllers.BaseAPIController
+	mobile_api_controllers.MobileBaseAPIAuthController
+}
+
+func PatientRouters() {
+	beego.Router("/api/patient/getbloodDialysisPatient", &PatientAPIController{}, "Get:GetBloodDialysisPatient")
+}
+
+func (this *PatientAPIController) GetBloodDialysisPatient() {
+	//adminUser := this.GetAdminUserInfo()
+	//orgId := adminUser.CurrentOrgId
+	//fmt.Print("orgId")
+	patient, err := service.GetBloodDialysisPatient(7957)
+	fmt.Print("报错------------------", err)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeDataException, "添加设备失败")
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}

routers/router.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/controllers"
 	admin_api "XT_New/controllers/admin_api_controllers"
 	m_api "XT_New/controllers/mobile_api_controllers"
+	"fmt"
 
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
@@ -55,4 +56,6 @@ func init() {
 	admin_api.AdminAPIControllersRegisterRouters()
 
 	controllers.ManageRouters()
+	fmt.Print("进来了美欧")
+	//controllers.PatientRouters()
 }

service/patientmanage_service.go

@@ -0,0 +1,9 @@
+package service
+
+import "XT_New/models"
+
+func GetBloodDialysisPatient(orgid int64) (paitents []*models.Patients, err error) {
+
+	err = XTReadDB().Model(&paitents).Where("user_org_id = ? and status =1", orgid).Find(&paitents).Error
+	return paitents, err
+}