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

controllers/new_mobile_api_controllers/new_dialysis_api_controller.go

@@ -2608,3 +2608,16 @@ func (this *NewDialysisApiController) GetOrgs() {
 		"orgs": orgs,
 	})
 }
+
+func (this *NewDialysisApiController) GetNewPatientId() {
+	id, _ := this.GetInt64("id")
+	fmt.Println("id是---", id)
+	patients, err := service.GetPatientNewId(id)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patients,
+	})
+}

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -154,5 +154,5 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/patient/getroleposition", &NewDialysisApiController{}, "Get:GetRolePosition")
 	beego.Router("/m/api/patient/getmobile", &NewDialysisApiController{}, "Get:GetMobile")
 	beego.Router("/m/api/patient/getorgs", &NewDialysisApiController{}, "Get:GetOrgs")
-
+	beego.Router("/m/api/patient/getnewpatientid", &NewDialysisApiController{}, "Get:GetNewPatientId")
 }

service/patientmanage_service.go

@@ -242,6 +242,12 @@ func GetPatientDetailTwo(id int64) (models.XtPatientsNew, error) {
 	return patients, err
 }
 
+func GetPatientNewId(id int64) (models.XtPatientsNew, error) {
+	patientsNew := models.XtPatientsNew{}
+	err := XTReadDB().Where("blood_id = ? and status = 1", id).Find(&patientsNew).Error
+	return patientsNew, err
+}
+
 func GetPatientDiseasesTwo(id int64) []int64 {
 	var dis []models.XtPatientsInfectiousDiseases
 	ids := make([]int64, 0)