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

controllers/sz/sz_his_api_controller.go

@@ -807,8 +807,8 @@ func (c *SZHisApiController) GetRegisterInfo() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIDCartNo)
 		return
 	}
-	doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
-	doctorDepartment, _ := service.GetDepartMentDetail(department)
+	//doctorInfo, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, doctor)
+	//doctorDepartment, _ := service.GetDepartMentDetail(department)
 
 	adminRole, _ := service.GetAdminUserInfoByID(adminInfo.CurrentOrgId, admin_user_id)
 	his, _ := service.GetHisPatientInfo(adminInfo.CurrentOrgId, patient_id, theTime.Unix())